fix conflict

Signed-off-by: husharp <[email protected]>

Author: HuSharp

server/schedule/filter/counter.go

@@ -183,6 +183,11 @@ func NewCounter(scope string) *Counter {
 	return &Counter{counter: counter, scope: scope}
 }
 
+// SetScope sets the scope for the counter.
+func (c *Counter) SetScope(scope string) {
+	c.scope = scope
+}
+
 // Add adds the filter counter.
 func (c *Counter) inc(action action, filterType filterType, sourceID uint64, targetID uint64) {
 	if _, ok := c.counter[action][filterType][sourceID]; !ok {

server/schedulers/balance_leader.go

@@ -231,6 +231,13 @@ func WithBalanceLeaderName(name string) BalanceLeaderCreateOption {
 	}
 }
 
+// WithBalanceLeaderFilterCounterName sets the filter counter name for the scheduler.
+func WithBalanceLeaderFilterCounterName(name string) BalanceLeaderCreateOption {
+	return func(s *balanceLeaderScheduler) {
+		s.filterCounter.SetScope(name)
+	}
+}
+
 func (l *balanceLeaderScheduler) GetName() string {
 	return l.name
 }

server/schedulers/balance_region.go

@@ -119,6 +119,13 @@ func WithBalanceRegionName(name string) BalanceRegionCreateOption {
 	}
 }
 
+// WithBalanceRegionFilterCounterName sets the filter counter name for the scheduler.
+func WithBalanceRegionFilterCounterName(name string) BalanceRegionCreateOption {
+	return func(s *balanceRegionScheduler) {
+		s.filterCounter.SetScope(name)
+	}
+}
+
 func (s *balanceRegionScheduler) GetName() string {
 	return s.conf.Name
 }

server/schedulers/scatter_range.go

@@ -165,12 +165,14 @@ func newScatterRangeScheduler(opController *schedule.OperatorController, config
 			&balanceLeaderSchedulerConfig{Ranges: []core.KeyRange{core.NewKeyRange("", "")}},
 			WithBalanceLeaderName("scatter-range-leader"),
 			WithBalanceLeaderCounter(scatterRangeLeaderCounter),
+			WithBalanceLeaderFilterCounterName("scatter-range-leader"),
 		),
 		balanceRegion: newBalanceRegionScheduler(
 			opController,
 			&balanceRegionSchedulerConfig{Ranges: []core.KeyRange{core.NewKeyRange("", "")}},
 			WithBalanceRegionName("scatter-range-region"),
 			WithBalanceRegionCounter(scatterRangeRegionCounter),
+			WithBalanceRegionFilterCounterName("scatter-range-region"),
 		),
 	}
 	return scheduler