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

fix major freeze about not ready index and rew_snapshot_gc_scn

Browse Source
This commit is contained in:
obdev
2023-02-09 13:56:58 +00:00
committed by ob-robot
parent d312d359b4
commit 122a53be18
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rootserver/freeze/ob_freeze_info_manager.cpp
View File

@ -478,12 +478,9 @@ int ObFreezeInfoManager::renew_snapshot_gc_scn()
SCN cur_snapshot_gc_scn;
SCN new_snapshot_gc_scn;
SCN cur_gts_scn;
int64_t affected_rows = 0;
ObMySQLTransaction trans;
ObRecursiveMutexGuard guard(lock_);
int64_t max_stale_time_ns = transaction::ObWeakReadUtil::max_stale_time_for_weak_consistency(
tenant_id_, transaction::ObWeakReadUtil::IGNORE_TENANT_EXIST_WARN) * 1000;
if (OB_FAIL(check_inner_stat())) {
LOG_WARN("inner error", KR(ret));
@ -492,10 +489,11 @@ int ObFreezeInfoManager::renew_snapshot_gc_scn()
} else if (OB_FAIL(ObGlobalStatProxy::select_snapshot_gc_scn_for_update(trans, tenant_id_,
cur_snapshot_gc_scn))) {
LOG_WARN("fail to select snapshot_gc_scn for update", KR(ret), K_(tenant_id));
} else if (OB_FAIL(get_gts(cur_gts_scn))) {
}
// no need to minus max_stale_time_for_weak_consistency since 4.1, because the collection of
// multi-version data no longer depends on snapshot_gc_scn since 4.1
else if (OB_FAIL(get_gts(new_snapshot_gc_scn))) {
LOG_WARN("fail to get_gts", KR(ret));
} else if (FALSE_IT(new_snapshot_gc_scn = SCN::minus(cur_gts_scn, max_stale_time_ns))) {
LOG_WARN("fail to calc new snapshot_gc_scn", KR(ret), K(cur_gts_scn));
} else if ((new_snapshot_gc_scn <= freeze_info_.latest_snapshot_gc_scn_)
|| (cur_snapshot_gc_scn >= new_snapshot_gc_scn)) {
ret = OB_ERR_UNEXPECTED;

2
src/rootserver/freeze/ob_major_freeze_rpc_define.cpp
View File

@ -82,7 +82,7 @@ int ObTenantMajorFreezeP::process()
}
} else {
ret = OB_MAJOR_FREEZE_NOT_ALLOW;
RS_LOG(ERROR, "fail to launch_major_freeze, forbidden in restore_major_freeze_service",
RS_LOG(WARN, "fail to launch_major_freeze, forbidden in restore_major_freeze_service",
KR(ret), K(req), K(is_primary_service));
}
return ret;

7
src/rootserver/freeze/ob_major_merge_progress_checker.cpp
View File

@ -320,6 +320,13 @@ int ObMajorMergeProgressChecker::check_tablet(
} else {
// no need check not ready index
need_check = !(table_schema->is_index_table() && !table_schema->can_read_index());
if (!need_check) {
// not ready index, no need to check tablet compaction_scn and validate index column checksum
ObTabletLSPair pair(tablet_info.get_tablet_id(), tablet_info.get_ls_id());
if (OB_FAIL(tablet_compaction_map_.set_refactored(pair, ObTabletCompactionStatus::CAN_SKIP_VERIFYING, true))) {
LOG_WARN("fail to set refactored", KR(ret), K(tablet_info));
}
}
}
if (OB_UNLIKELY(tablet_id.is_special_merge_tablet())) {