From 211b04dd7494e92993848a9dd3a533b00d2504f2 Mon Sep 17 00:00:00 2001 From: husharp Date: Thu, 25 Apr 2024 16:55:14 +0800 Subject: [PATCH 1/2] fix name Signed-off-by: husharp --- pkg/schedule/filter/counter.go | 4 ++++ pkg/schedule/schedulers/balance_leader.go | 7 +++++++ pkg/schedule/schedulers/balance_region.go | 7 +++++++ pkg/schedule/schedulers/scatter_range.go | 2 ++ 4 files changed, 20 insertions(+) diff --git a/pkg/schedule/filter/counter.go b/pkg/schedule/filter/counter.go index 0120ef5b666..29c75bbe41d 100644 --- a/pkg/schedule/filter/counter.go +++ b/pkg/schedule/filter/counter.go @@ -188,6 +188,10 @@ func NewCounter(scope string) *Counter { return &Counter{counter: counter, scope: scope} } +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 { diff --git a/pkg/schedule/schedulers/balance_leader.go b/pkg/schedule/schedulers/balance_leader.go index 1b24d42b8d9..a9b63b659ea 100644 --- a/pkg/schedule/schedulers/balance_leader.go +++ b/pkg/schedule/schedulers/balance_leader.go @@ -208,6 +208,13 @@ func (l *balanceLeaderScheduler) ServeHTTP(w http.ResponseWriter, r *http.Reques // BalanceLeaderCreateOption is used to create a scheduler with an option. type BalanceLeaderCreateOption func(s *balanceLeaderScheduler) +// WithBalanceLeaderFilterCounterName sets the filter counter name for the scheduler. +func WithBalanceLeaderFilterCounterName(name string) BalanceLeaderCreateOption { + return func(s *balanceLeaderScheduler) { + s.filterCounter.SetScope(name) + } +} + // WithBalanceLeaderName sets the name for the scheduler. func WithBalanceLeaderName(name string) BalanceLeaderCreateOption { return func(s *balanceLeaderScheduler) { diff --git a/pkg/schedule/schedulers/balance_region.go b/pkg/schedule/schedulers/balance_region.go index 8d024488201..36e8becf3fb 100644 --- a/pkg/schedule/schedulers/balance_region.go +++ b/pkg/schedule/schedulers/balance_region.go @@ -92,6 +92,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 } diff --git a/pkg/schedule/schedulers/scatter_range.go b/pkg/schedule/schedulers/scatter_range.go index 9ad9e597dfd..4b700578111 100644 --- a/pkg/schedule/schedulers/scatter_range.go +++ b/pkg/schedule/schedulers/scatter_range.go @@ -138,11 +138,13 @@ func newScatterRangeScheduler(opController *operator.Controller, config *scatter opController, &balanceLeaderSchedulerConfig{Ranges: []core.KeyRange{core.NewKeyRange("", "")}}, WithBalanceLeaderName("scatter-range-leader"), + WithBalanceLeaderFilterCounterName("scatter-range-leader"), ), balanceRegion: newBalanceRegionScheduler( opController, &balanceRegionSchedulerConfig{Ranges: []core.KeyRange{core.NewKeyRange("", "")}}, WithBalanceRegionName("scatter-range-region"), + WithBalanceRegionFilterCounterName("scatter-range-region"), ), } return scheduler From 67d183c15c95eca904bc245749b889e35ed5043f Mon Sep 17 00:00:00 2001 From: husharp Date: Fri, 26 Apr 2024 13:30:29 +0800 Subject: [PATCH 2/2] make static happy Signed-off-by: husharp --- pkg/schedule/filter/counter.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/schedule/filter/counter.go b/pkg/schedule/filter/counter.go index 29c75bbe41d..b897169697f 100644 --- a/pkg/schedule/filter/counter.go +++ b/pkg/schedule/filter/counter.go @@ -188,6 +188,7 @@ 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 }