Skip to content

Commit fe4c04b

Browse files
visualYJDketor
authored andcommitted
[fix][store] Check target region valid when auto merge
1 parent e63f755 commit fe4c04b

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/merge/merge_checker.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@ void MergeCheckTask::MergeCheck() {
183183
if (!need_merge) {
184184
break;
185185
}
186+
need_merge = ValidRegion(merge_to_region_, reason);
187+
if (!need_merge) {
188+
break;
189+
}
186190
if (CheckLeaderAndFollowerStatus(merge_from_region_->Id())) {
187191
need_merge = false;
188192
reason = "not leader or follower abnormal";
@@ -410,6 +414,10 @@ void PreMergeCheckTask::PreMergeCheck() {
410414
if (!need_scan_check) {
411415
break;
412416
}
417+
need_scan_check = ValidRegion(merge_to, reason);
418+
if (!need_scan_check) {
419+
break;
420+
}
413421
if (merge_check_workers_->IsExistRegionChecking(merge_from->Id())) {
414422
need_scan_check = false;
415423
reason = "region already exist merge check";

0 commit comments

Comments
 (0)