Skip to content

Commit 05a87b2

Browse files
committed
fix conflict
Signed-off-by: husharp <[email protected]>
1 parent efb03ec commit 05a87b2

File tree

4 files changed

+21
-0
lines changed

4 files changed

+21
-0
lines changed

server/schedule/filter/counter.go

+5
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@ func NewCounter(scope string) *Counter {
183183
return &Counter{counter: counter, scope: scope}
184184
}
185185

186+
// SetScope sets the scope for the counter.
187+
func (c *Counter) SetScope(scope string) {
188+
c.scope = scope
189+
}
190+
186191
// Add adds the filter counter.
187192
func (c *Counter) inc(action action, filterType filterType, sourceID uint64, targetID uint64) {
188193
if _, ok := c.counter[action][filterType][sourceID]; !ok {

server/schedulers/balance_leader.go

+7
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,13 @@ func WithBalanceLeaderName(name string) BalanceLeaderCreateOption {
231231
}
232232
}
233233

234+
// WithBalanceLeaderFilterCounterName sets the filter counter name for the scheduler.
235+
func WithBalanceLeaderFilterCounterName(name string) BalanceLeaderCreateOption {
236+
return func(s *balanceLeaderScheduler) {
237+
s.filterCounter.SetScope(name)
238+
}
239+
}
240+
234241
func (l *balanceLeaderScheduler) GetName() string {
235242
return l.name
236243
}

server/schedulers/balance_region.go

+7
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@ func WithBalanceRegionName(name string) BalanceRegionCreateOption {
119119
}
120120
}
121121

122+
// WithBalanceRegionFilterCounterName sets the filter counter name for the scheduler.
123+
func WithBalanceRegionFilterCounterName(name string) BalanceRegionCreateOption {
124+
return func(s *balanceRegionScheduler) {
125+
s.filterCounter.SetScope(name)
126+
}
127+
}
128+
122129
func (s *balanceRegionScheduler) GetName() string {
123130
return s.conf.Name
124131
}

server/schedulers/scatter_range.go

+2
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,14 @@ func newScatterRangeScheduler(opController *schedule.OperatorController, config
165165
&balanceLeaderSchedulerConfig{Ranges: []core.KeyRange{core.NewKeyRange("", "")}},
166166
WithBalanceLeaderName("scatter-range-leader"),
167167
WithBalanceLeaderCounter(scatterRangeLeaderCounter),
168+
WithBalanceLeaderFilterCounterName("scatter-range-leader"),
168169
),
169170
balanceRegion: newBalanceRegionScheduler(
170171
opController,
171172
&balanceRegionSchedulerConfig{Ranges: []core.KeyRange{core.NewKeyRange("", "")}},
172173
WithBalanceRegionName("scatter-range-region"),
173174
WithBalanceRegionCounter(scatterRangeRegionCounter),
175+
WithBalanceRegionFilterCounterName("scatter-range-region"),
174176
),
175177
}
176178
return scheduler

0 commit comments

Comments
 (0)