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

Return error code if freeze is running in tablet_freeze_for_replace_tablet_meta

Browse Source
This commit is contained in:
obdev
2022-12-21 12:07:51 +00:00
committed by ob-robot
parent 95f78c82b6
commit 361503dc6d
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,10 +697,8 @@ int ObFreezer::tablet_freeze_for_replace_tablet_meta(const ObTabletID &tablet_id
LOG_WARN("freezer is offline, can not freeze now", K(ret), K(ls_id));
} else if (OB_FAIL(guard.try_set_tablet_freeze_begin())) {
// no need freeze now, a ls freeze is running or will be running
ret = OB_SUCCESS;
FLOG_INFO("[Freezer] ls freeze is running, no need freeze again", K(ret), K(ls_id), K(tablet_id));
} else if (OB_FAIL(set_freeze_flag_without_inc_freeze_clock())) {
ret = OB_SUCCESS;
} else if (OB_FAIL(loop_set_freeze_flag())) {
FLOG_INFO("[Freezer] freeze is running", K(ret), K(ls_id), K(tablet_id));
} else if (FALSE_IT(stat_.state_ = ObFreezeState::NOT_SUBMIT_LOG)) {
} else {

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

@ -3166,11 +3166,7 @@ int ObLSTabletService::build_ha_tablet_new_table_store(
} else 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))) {
if (OB_ENTRY_EXIST == ret) {
ret = OB_SUCCESS;
} else {
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));
} else {
is_tablet_freeze = true;
}