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

fix zone merge info defense

Browse Source
This commit is contained in:
yangqise7en
2023-11-02 04:39:10 +00:00
committed by ob-robot
parent cab8b108cc
commit 52efbcb6b0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rootserver/freeze/ob_zone_merge_manager.cpp
View File

@ -359,8 +359,9 @@ int ObZoneMergeManagerBase::finish_zone_merge(
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", KR(ret), K(zone), K_(tenant_id),
K(new_last_merged_scn), K(new_all_merged_scn));
} else if ((new_last_merged_scn != zone_merge_infos_[idx].broadcast_scn())
|| (new_last_merged_scn <= zone_merge_infos_[idx].last_merged_scn())) {
} else if (new_last_merged_scn > zone_merge_infos_[idx].broadcast_scn()) {
// do nothing, this zone may not execute current round major
} else if (new_last_merged_scn <= zone_merge_infos_[idx].last_merged_scn()) {
ret = OB_INVALID_ARGUMENT;
LOG_ERROR("invalid merged_scn", KR(ret), K(zone), K_(tenant_id),
K(new_last_merged_scn), K(new_all_merged_scn),
@ -402,7 +403,8 @@ int ObZoneMergeManagerBase::finish_zone_merge(
}
}
LOG_INFO("finish zone merge", KR(ret), K_(tenant_id), K(zone), K(new_last_merged_scn), K(new_all_merged_scn));
LOG_INFO("finish zone merge", KR(ret), K_(tenant_id), K(zone), K(new_last_merged_scn), K(new_all_merged_scn),
"zone_merge_info", zone_merge_infos_[idx]);
return ret;
}