pd-ctl: rename scatter-range to scatter-range-scheduler

client/http/api.go

@@ -59,8 +59,7 @@ const (
 	RegionLabelRules      = "/pd/api/v1/config/region-label/rules"
 	RegionLabelRulesByIDs = "/pd/api/v1/config/region-label/rules/ids"
 	// Scheduler
-	Schedulers            = "/pd/api/v1/schedulers"
-	scatterRangeScheduler = "/pd/api/v1/schedulers/scatter-range-"
+	Schedulers = "/pd/api/v1/schedulers"
 	// Admin
 	ResetTS                = "/pd/api/v1/admin/reset-ts"
 	BaseAllocID            = "/pd/api/v1/admin/base-alloc-id"
@@ -182,11 +181,6 @@ func SchedulerByName(name string) string {
 	return fmt.Sprintf("%s/%s", Schedulers, name)
 }
 
-// ScatterRangeSchedulerWithName returns the scatter range scheduler API with name parameter.
-func ScatterRangeSchedulerWithName(name string) string {
-	return fmt.Sprintf("%s%s", scatterRangeScheduler, name)
-}
-
 // PProfProfileAPIWithInterval returns the pprof profile API with interval parameter.
 func PProfProfileAPIWithInterval(interval time.Duration) string {
 	return fmt.Sprintf("%s?seconds=%d", PProfProfile, interval/time.Second)

pkg/schedule/schedulers/scatter_range.go

@@ -90,7 +90,7 @@ func (conf *scatterRangeSchedulerConfig) getEndKey() []byte {
 func (conf *scatterRangeSchedulerConfig) getSchedulerName() string {
 	conf.RLock()
 	defer conf.RUnlock()
-	return fmt.Sprintf("scatter-range-%s", conf.RangeName)
+	return fmt.Sprintf("%s-%s", types.ScatterRangeScheduler, conf.RangeName)
 }
 
 type scatterRangeScheduler struct {

pkg/schedule/types/type.go

@@ -57,8 +57,7 @@ const (
 	// RandomMergeScheduler is random merge scheduler name.
 	RandomMergeScheduler CheckerSchedulerType = "random-merge-scheduler"
 	// ScatterRangeScheduler is scatter range scheduler name.
-	// TODO: update to `scatter-range-scheduler`
-	ScatterRangeScheduler CheckerSchedulerType = "scatter-range"
+	ScatterRangeScheduler CheckerSchedulerType = "scatter-range-scheduler"
 	// ShuffleHotRegionScheduler is shuffle hot region scheduler name.
 	ShuffleHotRegionScheduler CheckerSchedulerType = "shuffle-hot-region-scheduler"
 	// ShuffleLeaderScheduler is shuffle leader scheduler name.
@@ -135,7 +134,8 @@ var (
 		"grant-hot-region-scheduler":   GrantHotRegionScheduler,
 		"balance-hot-region-scheduler": BalanceHotRegionScheduler,
 		"random-merge-scheduler":       RandomMergeScheduler,
-		// TODO: update to `scatter-range-scheduler`
+		"scatter-range-scheduler":      ScatterRangeScheduler,
+		// TODO: remove `scatter-range` after remove `NewScatterRangeSchedulerCommand` from pd-ctl
 		"scatter-range":                     ScatterRangeScheduler,
 		"shuffle-hot-region-scheduler":      ShuffleHotRegionScheduler,
 		"shuffle-leader-scheduler":          ShuffleLeaderScheduler,

tools/pd-ctl/pdctl/command/scheduler.go

@@ -149,6 +149,7 @@ func NewAddSchedulerCommand() *cobra.Command {
 	c.AddCommand(NewShuffleRegionSchedulerCommand())
 	c.AddCommand(NewShuffleHotRegionSchedulerCommand())
 	c.AddCommand(NewScatterRangeSchedulerCommand())
+	c.AddCommand(NewScatterRangeSchedulerCommandV2())
 	c.AddCommand(NewBalanceLeaderSchedulerCommand())
 	c.AddCommand(NewBalanceRegionSchedulerCommand())
 	c.AddCommand(NewBalanceHotRegionSchedulerCommand())
@@ -423,6 +424,17 @@ func addSchedulerCommandFunc(cmd *cobra.Command, args []string) {
 func NewScatterRangeSchedulerCommand() *cobra.Command {
 	c := &cobra.Command{
 		Use:   "scatter-range [--format=raw|encode|hex] <start_key> <end_key> <range_name>",
+		Short: "scatter-range will be deprecated in the future, please use scatter-range-scheduler instead",
+		Run:   addSchedulerForScatterRangeCommandFunc,
+	}
+	c.Flags().String("format", "hex", "the key format")
+	return c
+}
+
+// NewScatterRangeSchedulerCommandV2 returns a command to add a scatter-range-scheduler.
+func NewScatterRangeSchedulerCommandV2() *cobra.Command {
+	c := &cobra.Command{
+		Use:   "scatter-range-scheduler [--format=raw|encode|hex] <start_key> <end_key> <range_name>",
 		Short: "add a scheduler to scatter range",
 		Run:   addSchedulerForScatterRangeCommandFunc,
 	}

tools/pd-ctl/tests/scheduler/scheduler_test.go

@@ -347,9 +347,9 @@ func (suite *schedulerTestSuite) checkScheduler(cluster *pdTests.TestCluster) {
 		"test", "test#", "?test",
 		/* TODO: to handle case like "tes&t", we need to modify the server's JSON render to unescape the HTML characters */
 	} {
-		echo = mustExec(re, cmd, []string{"-u", pdAddr, "scheduler", "add", "scatter-range", "--format=raw", "a", "b", name}, nil)
+		echo = mustExec(re, cmd, []string{"-u", pdAddr, "scheduler", "add", "scatter-range-scheduler", "--format=raw", "a", "b", name}, nil)
 		re.Contains(echo, "Success!")
-		schedulerName := fmt.Sprintf("scatter-range-%s", name)
+		schedulerName := fmt.Sprintf("scatter-range-scheduler-%s", name)
 		// test show scheduler
 		testutil.Eventually(re, func() bool {
 			echo = mustExec(re, cmd, []string{"-u", pdAddr, "scheduler", "show"}, nil)