hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move set_memtable_clog_checkpoint_scn

Browse Source
This commit is contained in:
obdev
2022-12-26 02:08:13 +00:00
committed by ob-robot
parent d1c6e3e1d1
commit 8cfaa51a71
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/ls/ob_freezer.cpp
View File

@ -949,7 +949,7 @@ int ObFreezer::loop_set_freeze_flag()
ret = OB_SUCCESS; ret = OB_SUCCESS;
if (OB_FAIL(set_freeze_flag_without_inc_freeze_clock())) { if (OB_FAIL(set_freeze_flag_without_inc_freeze_clock())) {
const int64_t cost_time = ObTimeUtility::current_time() - start; 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), TRANS_LOG(WARN, "[Freezer] wait the running freeze too long time", K(ls_id),
K(cost_time)); K(cost_time));
break; break;

6
src/storage/ls/ob_ls_tablet_service.cpp
View File

@ -3161,9 +3161,7 @@ int ObLSTabletService::build_ha_tablet_new_table_store(
// try tablet freeze // try tablet freeze
if (!tablet_id.is_ls_inner_tablet()) { if (!tablet_id.is_ls_inner_tablet()) {
if (OB_FAIL(old_tablet->set_memtable_clog_checkpoint_scn(param.tablet_meta_))) { if (nullptr != 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_
&& old_tablet->get_clog_checkpoint_scn() < param.tablet_meta_->clog_checkpoint_scn_) { && 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))) { 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)); 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)); LOG_ERROR("failed to compare and swap tablet", K(ret), K(key), K(disk_addr));
ob_usleep(1000 * 1000); ob_usleep(1000 * 1000);
ob_abort(); 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 { } else {
LOG_INFO("succeed to build ha tablet new table store", K(ret), K(key), K(disk_addr), K(param)); LOG_INFO("succeed to build ha tablet new table store", K(ret), K(key), K(disk_addr), K(param));
} }