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

fix mysqltest about clear_merge_error in case of restart

Browse Source
This commit is contained in:
LiefB 2023-11-07 11:13:06 +00:00 committed by ob-robot
parent 505d5a601a
commit d3d8f764a0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rootserver/freeze/ob_tenant_major_freeze.cpp
View File

@ -221,6 +221,8 @@ int ObTenantMajorFreeze::suspend_merge()
LOG_WARN("fail to try reload zone_merge_mgr", KR(ret), K_(tenant_id));
} else {
const int64_t expected_epoch = merge_scheduler_.get_epoch();
// in case of observer start or restart, before the MajorMergeScheduler background thread
// successfully update freeze_service_epoch, the epoch in memory is equal to -1.
if (-1 == expected_epoch) {
ret = OB_EAGAIN;
LOG_WARN("epoch has not been updated, will retry", KR(ret), K_(tenant_id));
@ -244,6 +246,8 @@ int ObTenantMajorFreeze::resume_merge()
LOG_WARN("fail to try reload zone_merge_mgr", KR(ret), K_(tenant_id));
} else {
const int64_t expected_epoch = merge_scheduler_.get_epoch();
// in case of observer start or restart, before the MajorMergeScheduler background thread
// successfully update freeze_service_epoch, the epoch in memory is equal to -1.
if (-1 == expected_epoch) {
ret = OB_EAGAIN;
LOG_WARN("epoch has not been updated, will retry", KR(ret), K_(tenant_id));
@ -268,6 +272,8 @@ int ObTenantMajorFreeze::clear_merge_error()
LOG_WARN("fail to try reload zone_merge_mgr", KR(ret), K_(tenant_id));
} else {
const int64_t expected_epoch = merge_scheduler_.get_epoch();
// in case of observer start or restart, before the MajorMergeScheduler background thread
// successfully update freeze_service_epoch, the epoch in memory is equal to -1.
if (-1 == expected_epoch) {
ret = OB_EAGAIN;
LOG_WARN("epoch has not been updated, will retry", KR(ret), K_(tenant_id));