schedule: fix the filter metrics flush (#8097) (#8463)

close #8098 schedule: fix the filter metrics flush Signed-off-by: nolouch <nolouch@gmail.com> Co-authored-by: nolouch <nolouch@gmail.com>
tikv · Jul 31, 2024 · 66fc7c4 · 66fc7c4
1 parent 632ee6e
commit 66fc7c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/schedule/schedulers/balance_leader.go b/pkg/schedule/schedulers/balance_leader.go
@@ -361,6 +361,7 @@ func (l *balanceLeaderScheduler) Schedule(cluster sche.SchedulerCluster, dryRun
 	if dryRun {
 		collector = plan.NewCollector(basePlan)
 	}
+	defer l.filterCounter.Flush()
 	batch := l.conf.getBatch()
 	balanceLeaderScheduleCounter.Inc()
 
@@ -402,7 +403,6 @@ func (l *balanceLeaderScheduler) Schedule(cluster sche.SchedulerCluster, dryRun
 			}
 		}
 	}
-	l.filterCounter.Flush()
 	l.retryQuota.GC(append(sourceCandidate.stores, targetCandidate.stores...))
 	return result, collector.GetPlans()
 }

diff --git a/pkg/schedule/schedulers/balance_region.go b/pkg/schedule/schedulers/balance_region.go
@@ -121,6 +121,7 @@ func (s *balanceRegionScheduler) IsScheduleAllowed(cluster sche.SchedulerCluster
 
 func (s *balanceRegionScheduler) Schedule(cluster sche.SchedulerCluster, dryRun bool) ([]*operator.Operator, []plan.Plan) {
 	basePlan := plan.NewBalanceSchedulerPlan()
+	defer s.filterCounter.Flush()
 	var collector *plan.Collector
 	if dryRun {
 		collector = plan.NewCollector(basePlan)
@@ -224,7 +225,6 @@ func (s *balanceRegionScheduler) Schedule(cluster sche.SchedulerCluster, dryRun
 		}
 		s.retryQuota.Attenuate(solver.Source)
 	}
-	s.filterCounter.Flush()
 	s.retryQuota.GC(stores)
 	return nil, collector.GetPlans()
 }