From 8cfaa51a7157cafab5d962fca2b9542c8f03bb86 Mon Sep 17 00:00:00 2001 From: obdev Date: Mon, 26 Dec 2022 02:08:13 +0000 Subject: [PATCH] Move set_memtable_clog_checkpoint_scn --- src/storage/ls/ob_freezer.cpp | 2 +- src/storage/ls/ob_ls_tablet_service.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/storage/ls/ob_freezer.cpp b/src/storage/ls/ob_freezer.cpp index ffcd791f18..ba83e0149d 100644 --- a/src/storage/ls/ob_freezer.cpp +++ b/src/storage/ls/ob_freezer.cpp @@ -949,7 +949,7 @@ int ObFreezer::loop_set_freeze_flag() ret = OB_SUCCESS; if (OB_FAIL(set_freeze_flag_without_inc_freeze_clock())) { const int64_t cost_time = ObTimeUtility::current_time() - start; - if (cost_time > 3 * 1000 * 1000) { + if (cost_time > 10 * 1000 * 1000) { TRANS_LOG(WARN, "[Freezer] wait the running freeze too long time", K(ls_id), K(cost_time)); break; diff --git a/src/storage/ls/ob_ls_tablet_service.cpp b/src/storage/ls/ob_ls_tablet_service.cpp index a280fb4fec..78c65d75f6 100644 --- a/src/storage/ls/ob_ls_tablet_service.cpp +++ b/src/storage/ls/ob_ls_tablet_service.cpp @@ -3161,9 +3161,7 @@ int ObLSTabletService::build_ha_tablet_new_table_store( // try tablet freeze if (!tablet_id.is_ls_inner_tablet()) { - if (OB_FAIL(old_tablet->set_memtable_clog_checkpoint_scn(param.tablet_meta_))) { - LOG_WARN("failed to set memtable clog checkpoint ts", K(ret), KPC(old_tablet), K(param)); - } else if (nullptr != param.tablet_meta_ + if (nullptr != param.tablet_meta_ && old_tablet->get_clog_checkpoint_scn() < param.tablet_meta_->clog_checkpoint_scn_) { if (OB_FAIL(freezer->tablet_freeze_for_replace_tablet_meta(tablet_id, imemtable))) { LOG_WARN("failed to freeze tablet", K(ret), K(tablet_id), KPC(old_tablet)); @@ -3225,6 +3223,8 @@ int ObLSTabletService::build_ha_tablet_new_table_store( LOG_ERROR("failed to compare and swap tablet", K(ret), K(key), K(disk_addr)); ob_usleep(1000 * 1000); ob_abort(); + } else if (OB_FAIL(old_tablet->set_memtable_clog_checkpoint_scn(param.tablet_meta_))) { + LOG_WARN("failed to set memtable clog checkpoint ts", K(ret), KPC(old_tablet), K(param)); } else { LOG_INFO("succeed to build ha tablet new table store", K(ret), K(key), K(disk_addr), K(param)); }