Skip to content

scheduler: decouple the keyranges with different schedulers #9330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
8 changes: 8 additions & 0 deletions pkg/mcs/scheduling/server/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
"github.com/tikv/pd/pkg/schedule"
sc "github.com/tikv/pd/pkg/schedule/config"
"github.com/tikv/pd/pkg/schedule/hbstream"
"github.com/tikv/pd/pkg/schedule/keyrange"
"github.com/tikv/pd/pkg/schedule/labeler"
"github.com/tikv/pd/pkg/schedule/operator"
"github.com/tikv/pd/pkg/schedule/placement"
Expand All @@ -62,6 +63,7 @@ type Cluster struct {
*core.BasicCluster
persistConfig *config.PersistConfig
ruleManager *placement.RuleManager
keyRangeManager *keyrange.Manager
labelerManager *labeler.RegionLabeler
regionStats *statistics.RegionStatistics
labelStats *statistics.LabelStatistics
Expand Down Expand Up @@ -114,6 +116,7 @@ func NewCluster(
cancel: cancel,
BasicCluster: basicCluster,
ruleManager: ruleManager,
keyRangeManager: keyrange.NewManager(),
labelerManager: labelerManager,
persistConfig: persistConfig,
hotStat: statistics.NewHotStat(ctx, basicCluster),
Expand Down Expand Up @@ -176,6 +179,11 @@ func (c *Cluster) GetRuleManager() *placement.RuleManager {
return c.ruleManager
}

// GetKeyRangeManager returns the key range manager
func (c *Cluster) GetKeyRangeManager() *keyrange.Manager {
return c.keyRangeManager
}

// GetRegionLabeler returns the region labeler.
func (c *Cluster) GetRegionLabeler() *labeler.RegionLabeler {
return c.labelerManager
Expand Down
8 changes: 8 additions & 0 deletions pkg/mock/mockcluster/mockcluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"github.com/tikv/pd/pkg/errs"
"github.com/tikv/pd/pkg/mock/mockid"
sc "github.com/tikv/pd/pkg/schedule/config"
"github.com/tikv/pd/pkg/schedule/keyrange"
"github.com/tikv/pd/pkg/schedule/labeler"
"github.com/tikv/pd/pkg/schedule/placement"
"github.com/tikv/pd/pkg/statistics"
Expand All @@ -55,6 +56,7 @@ type Cluster struct {
*core.BasicCluster
*mockid.IDAllocator
*placement.RuleManager
*keyrange.Manager
*labeler.RegionLabeler
*statistics.HotStat
*config.PersistOptions
Expand All @@ -73,6 +75,7 @@ func NewCluster(ctx context.Context, opts *config.PersistOptions) *Cluster {
HotStat: statistics.NewHotStat(ctx, bc),
HotBucketCache: buckets.NewBucketsCache(ctx),
PersistOptions: opts,
Manager: keyrange.NewManager(),
pendingProcessedRegions: map[uint64]struct{}{},
Storage: storage.NewStorageWithMemoryBackend(),
}
Expand Down Expand Up @@ -214,6 +217,11 @@ func (mc *Cluster) GetRuleManager() *placement.RuleManager {
return mc.RuleManager
}

// GetKeyRangeManager returns the key range manager of the cluster.
func (mc *Cluster) GetKeyRangeManager() *keyrange.Manager {
return mc.Manager
}

// GetRegionLabeler returns the region labeler of the cluster.
func (mc *Cluster) GetRegionLabeler() *labeler.RegionLabeler {
return mc.RegionLabeler
Expand Down
2 changes: 2 additions & 0 deletions pkg/schedule/core/cluster_informer.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package core
import (
"github.com/tikv/pd/pkg/core"
sc "github.com/tikv/pd/pkg/schedule/config"
"github.com/tikv/pd/pkg/schedule/keyrange"
"github.com/tikv/pd/pkg/schedule/labeler"
"github.com/tikv/pd/pkg/schedule/placement"
"github.com/tikv/pd/pkg/statistics"
Expand Down Expand Up @@ -61,6 +62,7 @@ type SharedCluster interface {
GetBasicCluster() *core.BasicCluster
GetSharedConfig() sc.SharedConfigProvider
GetRuleManager() *placement.RuleManager
GetKeyRangeManager() *keyrange.Manager
AllocID(uint32) (uint64, uint32, error)
IsSchedulingHalted() bool
}
Expand Down
60 changes: 60 additions & 0 deletions pkg/schedule/keyrange/manager.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// Copyright 2025 TiKV Project Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package keyrange

import (
"sync"

"github.com/tikv/pd/pkg/utils/keyutil"
)

// Manager is a manager for key ranges.
type Manager struct {
sync.Mutex
sortedKeyRanges *keyutil.KeyRanges
}

// NewManager creates a new Manager.
func NewManager() *Manager {
return &Manager{
sortedKeyRanges: &keyutil.KeyRanges{},
}
}

// GetNonOverlappingKeyRanges returns the non-overlapping key ranges of the given base key range.
func (s *Manager) GetNonOverlappingKeyRanges(base *keyutil.KeyRange) []keyutil.KeyRange {
s.Lock()
defer s.Unlock()
return s.sortedKeyRanges.SubtractKeyRanges(base)
}

// Append appends the key ranges to the manager.
func (s *Manager) Append(rs []keyutil.KeyRange) {
s.Lock()
defer s.Unlock()
for _, r := range rs {
s.sortedKeyRanges.Append(r.StartKey, r.EndKey)
}
s.sortedKeyRanges.SortAndDeduce()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For every time we append, we need to sort?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

Copy link
Contributor Author

@bufferflies bufferflies Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, using adjust function to check the two regions

}

// Delete deletes the overlapping key ranges from the manager.
func (s *Manager) Delete(rs []keyutil.KeyRange) {
s.Lock()
defer s.Unlock()
for _, r := range rs {
s.sortedKeyRanges.Delete(&r)
}
}
14 changes: 12 additions & 2 deletions pkg/schedule/schedulers/balance_leader.go
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,12 @@ func makeInfluence(op *operator.Operator, plan *solver, usedRegions map[uint64]s
// It randomly selects a health region from the source store, then picks
// the best follower peer and transfers the leader.
func (s *balanceLeaderScheduler) transferLeaderOut(solver *solver, collector *plan.Collector) *operator.Operator {
solver.Region = filter.SelectOneRegion(solver.RandLeaderRegions(solver.sourceStoreID(), s.conf.getRanges()),
rs := s.conf.getRanges()
if IsDefaultKeyRange(rs) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about the hot region scheduler?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hot region scheduler can schedule all the regions, not restricting this limit.

km := solver.GetKeyRangeManager()
rs = km.GetNonOverlappingKeyRanges(&rs[0])
}
solver.Region = filter.SelectOneRegion(solver.RandLeaderRegions(solver.sourceStoreID(), rs),
collector, filter.NewRegionPendingFilter(), filter.NewRegionDownFilter())
if solver.Region == nil {
log.Debug("store has no leader", zap.String("scheduler", s.GetName()), zap.Uint64("store-id", solver.sourceStoreID()))
Expand Down Expand Up @@ -473,7 +478,12 @@ func (s *balanceLeaderScheduler) transferLeaderOut(solver *solver, collector *pl
// It randomly selects a health region from the target store, then picks
// the worst follower peer and transfers the leader.
func (s *balanceLeaderScheduler) transferLeaderIn(solver *solver, collector *plan.Collector) *operator.Operator {
solver.Region = filter.SelectOneRegion(solver.RandFollowerRegions(solver.targetStoreID(), s.conf.getRanges()),
rs := s.conf.getRanges()
if IsDefaultKeyRange(rs) {
km := solver.GetKeyRangeManager()
rs = km.GetNonOverlappingKeyRanges(&rs[0])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will it slow down the balance leader's speed?

}
solver.Region = filter.SelectOneRegion(solver.RandFollowerRegions(solver.targetStoreID(), rs),
nil, filter.NewRegionPendingFilter(), filter.NewRegionDownFilter())
if solver.Region == nil {
log.Debug("store has no follower", zap.String("scheduler", s.GetName()), zap.Uint64("store-id", solver.targetStoreID()))
Expand Down
8 changes: 8 additions & 0 deletions pkg/schedule/schedulers/balance_leader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/tikv/pd/pkg/schedule/plan"
"github.com/tikv/pd/pkg/schedule/types"
"github.com/tikv/pd/pkg/storage"
"github.com/tikv/pd/pkg/utils/keyutil"
"github.com/tikv/pd/pkg/utils/operatorutil"
"github.com/tikv/pd/pkg/versioninfo"
)
Expand Down Expand Up @@ -449,6 +450,13 @@ func (suite *balanceLeaderRangeSchedulerTestSuite) TestSingleRangeBalance() {
re.NoError(err)
ops, _ = lb.Schedule(suite.tc, false)
re.Empty(ops)

kye := keyutil.NewKeyRange("a", "g")
suite.tc.Append([]keyutil.KeyRange{kye})
lb, err = CreateScheduler(types.BalanceLeaderScheduler, suite.oc, storage.NewStorageWithMemoryBackend(), ConfigSliceDecoder(types.BalanceLeaderScheduler, []string{"", ""}))
re.NoError(err)
ops, _ = lb.Schedule(suite.tc, false)
re.Empty(ops)
}

func (suite *balanceLeaderRangeSchedulerTestSuite) TestMultiRangeBalance() {
Expand Down
16 changes: 14 additions & 2 deletions pkg/schedule/schedulers/balance_range.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import (
)

var (
defaultJobTimeout = time.Hour
defaultJobTimeout = 30 * time.Minute
reserveDuration = 7 * 24 * time.Hour
)

Expand Down Expand Up @@ -116,7 +116,7 @@ func (handler *balanceRangeSchedulerHandler) addJob(w http.ResponseWriter, r *ht
handler.rd.JSON(w, http.StatusBadRequest, fmt.Sprintf("end key:%s can't be unescaped", input["end-key"].(string)))
return
}
log.Info("add balance key range job", zap.String("start-key", startKeyStr), zap.String("end-key", endKeyStr))
log.Info("add balance key range job", zap.String("alias", job.Alias))
rs, err := decodeKeyRanges(endKeyStr, startKeyStr)
if err != nil {
handler.rd.JSON(w, http.StatusBadRequest, err.Error())
Expand Down Expand Up @@ -173,6 +173,14 @@ type balanceRangeSchedulerConfig struct {
func (conf *balanceRangeSchedulerConfig) addJob(job *balanceRangeSchedulerJob) error {
conf.Lock()
defer conf.Unlock()
for _, c := range conf.jobs {
if c.isComplete() {
continue
}
if job.Alias == c.Alias {
return errors.New("job already exists")
}
}
job.Status = pending
if len(conf.jobs) == 0 {
job.JobID = 1
Expand Down Expand Up @@ -394,12 +402,16 @@ func (s *balanceRangeScheduler) IsScheduleAllowed(cluster sche.SchedulerCluster)
if err := s.conf.begin(index); err != nil {
return false
}
km := cluster.GetKeyRangeManager()
km.Append(job.Ranges)
}
// todo: add other conditions such as the diff of the score between the source and target store.
if time.Since(*job.Start) > job.Timeout {
if err := s.conf.finish(index); err != nil {
return false
}
km := cluster.GetKeyRangeManager()
km.Delete(job.Ranges)
balanceRangeExpiredCounter.Inc()
}
}
Expand Down
15 changes: 14 additions & 1 deletion pkg/schedule/schedulers/balance_range_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ func TestTIKVEngine(t *testing.T) {
scheduler, err := CreateScheduler(types.BalanceRangeScheduler, oc, storage.NewStorageWithMemoryBackend(),
ConfigSliceDecoder(types.BalanceRangeScheduler,
[]string{"leader-scatter", "tikv", "1h", "test", "100", "200"}))
re.True(scheduler.IsScheduleAllowed(tc))
km := tc.GetKeyRangeManager()
kr := keyutil.NewKeyRange("", "")
ranges := km.GetNonOverlappingKeyRanges(&kr)
re.Len(ranges, 2)
re.Equal(ranges[0], keyutil.NewKeyRange("", "100"))
re.Equal(ranges[1], keyutil.NewKeyRange("200", ""))

re.NoError(err)
ops, _ := scheduler.Schedule(tc, true)
re.Empty(ops)
Expand Down Expand Up @@ -172,6 +180,7 @@ func TestFetchAllRegions(t *testing.T) {
func TestCodecConfig(t *testing.T) {
re := require.New(t)
job := &balanceRangeSchedulerJob{
Alias: "test.t",
Engine: core.EngineTiKV,
Rule: core.LeaderScatter,
JobID: 1,
Expand All @@ -189,13 +198,15 @@ func TestCodecConfig(t *testing.T) {
re.Equal(conf1.jobs, conf.jobs)

job1 := &balanceRangeSchedulerJob{
Alias: "test.t2",
Engine: core.EngineTiKV,
Rule: core.LeaderScatter,
Status: running,
Ranges: []keyutil.KeyRange{keyutil.NewKeyRange("a", "b")},
JobID: 2,
}
re.NoError(conf.addJob(job1))
re.Error(conf.addJob(job1))
re.NoError(conf.load(&conf1))
re.Equal(conf1.jobs, conf.jobs)

Expand Down Expand Up @@ -271,7 +282,9 @@ func TestPersistFail(t *testing.T) {
}
conf.init("test", storage.NewStorageWithMemoryBackend(), conf)
errMsg := "fail to persist"
newJob := &balanceRangeSchedulerJob{}
newJob := &balanceRangeSchedulerJob{
Alias: "test.t",
}
re.ErrorContains(conf.addJob(newJob), errMsg)
re.Len(conf.jobs, 1)

Expand Down
13 changes: 9 additions & 4 deletions pkg/schedule/schedulers/balance_region.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ func (s *balanceRegionScheduler) Schedule(cluster sche.SchedulerCluster, dryRun
solver.Step++
var sourceIndex int

rs := s.conf.Ranges
Copy link
Member

@rleungx rleungx May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the Ranges always have a value?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it can be seen as

func getKeyRanges(args []string) ([]keyutil.KeyRange, error) {
var ranges []keyutil.KeyRange
for len(args) > 1 {
startKey, err := url.QueryUnescape(args[0])
if err != nil {
return nil, errs.ErrQueryUnescape.Wrap(err)
}
endKey, err := url.QueryUnescape(args[1])
if err != nil {
return nil, errs.ErrQueryUnescape.Wrap(err)
}
args = args[2:]
ranges = append(ranges, keyutil.NewKeyRange(startKey, endKey))
}
if len(ranges) == 0 {
return []keyutil.KeyRange{keyutil.NewKeyRange("", "")}, nil
}
return ranges, nil
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if we change the range manually?

if IsDefaultKeyRange(rs) {
km := solver.GetKeyRangeManager()
rs = km.GetNonOverlappingKeyRanges(&rs[0])
}
// sourcesStore is sorted by region score desc, so we pick the first store as source store.
for sourceIndex, solver.Source = range sourceStores {
retryLimit := s.getLimit(solver.Source)
Expand All @@ -147,21 +152,21 @@ func (s *balanceRegionScheduler) Schedule(cluster sche.SchedulerCluster, dryRun
for range retryLimit {
// Priority pick the region that has a pending peer.
// Pending region may mean the disk is overload, remove the pending region firstly.
solver.Region = filter.SelectOneRegion(cluster.RandPendingRegions(solver.sourceStoreID(), s.conf.Ranges), collector,
solver.Region = filter.SelectOneRegion(cluster.RandPendingRegions(solver.sourceStoreID(), rs), collector,
append(baseRegionFilters, filter.NewRegionWitnessFilter(solver.sourceStoreID()))...)
if solver.Region == nil {
// Then pick the region that has a follower in the source store.
solver.Region = filter.SelectOneRegion(cluster.RandFollowerRegions(solver.sourceStoreID(), s.conf.Ranges), collector,
solver.Region = filter.SelectOneRegion(cluster.RandFollowerRegions(solver.sourceStoreID(), rs), collector,
append(baseRegionFilters, filter.NewRegionWitnessFilter(solver.sourceStoreID()), pendingFilter)...)
}
if solver.Region == nil {
// Then pick the region has the leader in the source store.
solver.Region = filter.SelectOneRegion(cluster.RandLeaderRegions(solver.sourceStoreID(), s.conf.Ranges), collector,
solver.Region = filter.SelectOneRegion(cluster.RandLeaderRegions(solver.sourceStoreID(), rs), collector,
append(baseRegionFilters, filter.NewRegionWitnessFilter(solver.sourceStoreID()), pendingFilter)...)
}
if solver.Region == nil {
// Finally, pick learner.
solver.Region = filter.SelectOneRegion(cluster.RandLearnerRegions(solver.sourceStoreID(), s.conf.Ranges), collector,
solver.Region = filter.SelectOneRegion(cluster.RandLearnerRegions(solver.sourceStoreID(), rs), collector,
append(baseRegionFilters, filter.NewRegionWitnessFilter(solver.sourceStoreID()), pendingFilter)...)
}
if solver.Region == nil {
Expand Down
8 changes: 8 additions & 0 deletions pkg/schedule/schedulers/balance_region_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/tikv/pd/pkg/schedule/plan"
"github.com/tikv/pd/pkg/schedule/types"
"github.com/tikv/pd/pkg/storage"
"github.com/tikv/pd/pkg/utils/keyutil"
"github.com/tikv/pd/pkg/utils/operatorutil"
"github.com/tikv/pd/pkg/versioninfo"
)
Expand Down Expand Up @@ -654,9 +655,16 @@ func TestBalanceRegionEmptyRegion(t *testing.T) {
core.SetApproximateKeys(1),
)
tc.PutRegion(region)

tc.Append([]keyutil.KeyRange{keyutil.NewKeyRange("a", "b")})
operators, _ := sb.Schedule(tc, false)
re.Empty(operators)
tc.Delete([]keyutil.KeyRange{keyutil.NewKeyRange("a", "b")})

operators, _ = sb.Schedule(tc, false)
re.NotEmpty(operators)

// reject the empty regions if the cluster has more regions.
for i := uint64(10); i < 111; i++ {
tc.PutRegionStores(i, 1, 3, 4)
}
Expand Down
8 changes: 8 additions & 0 deletions pkg/schedule/schedulers/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -411,3 +411,11 @@ func pauseAndResumeLeaderTransfer[T any](cluster *core.BasicCluster, direction c
}
}
}

// IsDefaultKeyRange checks if the given key ranges are the default key range.
func IsDefaultKeyRange(rs []keyutil.KeyRange) bool {
if len(rs) == 1 && len(rs[0].StartKey) == 0 && len(rs[0].EndKey) == 0 {
return true
}
return false
}
Loading
Loading