File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed
Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff 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" ;
You can’t perform that action at this time.
0 commit comments