From eb18e0ba1b039ae650eac762f4b39f37eaa3fe8c Mon Sep 17 00:00:00 2001 From: obdev Date: Tue, 21 Jun 2022 10:59:36 +0800 Subject: [PATCH] [CP] modify the process of cleaning dirty trans context which is commited --- src/storage/ob_pg_sstable_mgr.cpp | 2 +- src/storage/ob_pg_storage.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/ob_pg_sstable_mgr.cpp b/src/storage/ob_pg_sstable_mgr.cpp index 40c7ffb19c..3190f94f34 100644 --- a/src/storage/ob_pg_sstable_mgr.cpp +++ b/src/storage/ob_pg_sstable_mgr.cpp @@ -993,7 +993,7 @@ int ObPGSSTableMgr::get_clean_out_log_ts(ObIArray &clean_out_log_ts) int64_t last_log_ts = -1; // duplicate log ts may exist, need to remove duplicate for (int64_t i = 0; OB_SUCC(ret) && i < log_ts_array.count(); i++) { - if (log_ts_array.at(i) < functor.get_min_complement_log_ts()) { + if (log_ts_array.at(i) <= functor.get_min_complement_log_ts()) { if (last_log_ts != log_ts_array.at(i)) { if (OB_FAIL(clean_out_log_ts.push_back(log_ts_array.at(i)))) { LOG_WARN("failed to push back log ts", K(ret)); diff --git a/src/storage/ob_pg_storage.cpp b/src/storage/ob_pg_storage.cpp index 3d4d5f7825..154eb2f6f7 100644 --- a/src/storage/ob_pg_storage.cpp +++ b/src/storage/ob_pg_storage.cpp @@ -6941,7 +6941,7 @@ int ObPGStorage::get_max_cleanout_log_ts(ObIArray &sstable_cleanout_log last_replay_log_ts = meta_->storage_info_.get_data_info().get_last_replay_log_ts(); } for (int64_t i = 0; OB_SUCC(ret) && i < log_ts_array.count(); i++) { - if (log_ts_array.at(i) < last_replay_log_ts) { + if (log_ts_array.at(i) <= last_replay_log_ts) { if (OB_FAIL(sstable_cleanout_log_ts.push_back(log_ts_array.at(i)))) { LOG_WARN("failed to push back log ts", K(ret), K(pkey_)); } -- GitLab