Skip to content

Commit 034b35b

Browse files
HuSharpti-chi-bot
authored andcommitted
This is an automated cherry-pick of #8124
close #8125 Signed-off-by: ti-chi-bot <[email protected]>
1 parent efb03ec commit 034b35b

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

server/schedule/filter/counter.go

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

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

server/schedulers/balance_leader.go

+7
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,17 @@ func (l *balanceLeaderScheduler) ServeHTTP(w http.ResponseWriter, r *http.Reques
217217
// BalanceLeaderCreateOption is used to create a scheduler with an option.
218218
type BalanceLeaderCreateOption func(s *balanceLeaderScheduler)
219219

220+
<<<<<<< HEAD:server/schedulers/balance_leader.go
220221
// WithBalanceLeaderCounter sets the counter for the scheduler.
221222
func WithBalanceLeaderCounter(counter *prometheus.CounterVec) BalanceLeaderCreateOption {
222223
return func(s *balanceLeaderScheduler) {
223224
s.counter = counter
225+
=======
226+
// WithBalanceLeaderFilterCounterName sets the filter counter name for the scheduler.
227+
func WithBalanceLeaderFilterCounterName(name string) BalanceLeaderCreateOption {
228+
return func(s *balanceLeaderScheduler) {
229+
s.filterCounter.SetScope(name)
230+
>>>>>>> 50c80407c (scheduler: fix scatter counter name (#8124)):pkg/schedule/schedulers/balance_leader.go
224231
}
225232
}
226233

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

+8
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,21 @@ func newScatterRangeScheduler(opController *schedule.OperatorController, config
164164
opController,
165165
&balanceLeaderSchedulerConfig{Ranges: []core.KeyRange{core.NewKeyRange("", "")}},
166166
WithBalanceLeaderName("scatter-range-leader"),
167+
<<<<<<< HEAD:server/schedulers/scatter_range.go
167168
WithBalanceLeaderCounter(scatterRangeLeaderCounter),
169+
=======
170+
WithBalanceLeaderFilterCounterName("scatter-range-leader"),
171+
>>>>>>> 50c80407c (scheduler: fix scatter counter name (#8124)):pkg/schedule/schedulers/scatter_range.go
168172
),
169173
balanceRegion: newBalanceRegionScheduler(
170174
opController,
171175
&balanceRegionSchedulerConfig{Ranges: []core.KeyRange{core.NewKeyRange("", "")}},
172176
WithBalanceRegionName("scatter-range-region"),
177+
<<<<<<< HEAD:server/schedulers/scatter_range.go
173178
WithBalanceRegionCounter(scatterRangeRegionCounter),
179+
=======
180+
WithBalanceRegionFilterCounterName("scatter-range-region"),
181+
>>>>>>> 50c80407c (scheduler: fix scatter counter name (#8124)):pkg/schedule/schedulers/scatter_range.go
174182
),
175183
}
176184
return scheduler

0 commit comments

Comments
 (0)