scheduler: support multi priorities api for hot-region-scheduler

server/schedulers/hot_region_config.go

@@ -30,6 +30,13 @@ import (
 	"github.com/unrolled/render"
 )
 
+const (
+	// BytePriority indicates hot-region-scheduler prefer byte dim
+	BytePriority = "byte"
+	// KeyPriority indicates hot-region-scheduler prefer key dim
+	KeyPriority = "key"
+)
+
 // params about hot region.
 func initHotRegionScheduleConfig() *hotRegionSchedulerConfig {
 	return &hotRegionSchedulerConfig{
@@ -45,6 +52,8 @@ func initHotRegionScheduleConfig() *hotRegionSchedulerConfig {
 		MaxPeerNum:             1000,
 		SrcToleranceRatio:      1.05, // Tolerate 5% difference
 		DstToleranceRatio:      1.05, // Tolerate 5% difference
+		ReadPriorities:         []string{BytePriority, KeyPriority},
+		WritePriorities:        []string{BytePriority, KeyPriority},
 	}
 }
 
@@ -59,14 +68,16 @@ type hotRegionSchedulerConfig struct {
 
 	// rank step ratio decide the step when calculate rank
 	// step = max current * rank step ratio
-	ByteRateRankStepRatio  float64 `json:"byte-rate-rank-step-ratio"`
-	KeyRateRankStepRatio   float64 `json:"key-rate-rank-step-ratio"`
-	QueryRateRankStepRatio float64 `json:"query-rate-rank-step-ratio"`
-	CountRankStepRatio     float64 `json:"count-rank-step-ratio"`
-	GreatDecRatio          float64 `json:"great-dec-ratio"`
-	MinorDecRatio          float64 `json:"minor-dec-ratio"`
-	SrcToleranceRatio      float64 `json:"src-tolerance-ratio"`
-	DstToleranceRatio      float64 `json:"dst-tolerance-ratio"`
+	ByteRateRankStepRatio  float64  `json:"byte-rate-rank-step-ratio"`
+	KeyRateRankStepRatio   float64  `json:"key-rate-rank-step-ratio"`
+	QueryRateRankStepRatio float64  `json:"query-rate-rank-step-ratio"`
+	CountRankStepRatio     float64  `json:"count-rank-step-ratio"`
+	GreatDecRatio          float64  `json:"great-dec-ratio"`
+	MinorDecRatio          float64  `json:"minor-dec-ratio"`
+	SrcToleranceRatio      float64  `json:"src-tolerance-ratio"`
+	DstToleranceRatio      float64  `json:"dst-tolerance-ratio"`
+	ReadPriorities         []string `json:"read-priorities"`
+	WritePriorities        []string `json:"write-priorities"`
 }
 
 func (conf *hotRegionSchedulerConfig) EncodeConfig() ([]byte, error) {

tests/pdctl/scheduler/scheduler_test.go

@@ -269,6 +269,8 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 		"minor-dec-ratio":            0.99,
 		"src-tolerance-ratio":        1.05,
 		"dst-tolerance-ratio":        1.05,
+		"read-priorities":            []interface{}{"byte", "key"},
+		"write-priorities":           []interface{}{"byte", "key"},
 	}
 	c.Assert(conf, DeepEquals, expected1)
 	mustExec([]string{"-u", pdAddr, "scheduler", "config", "balance-hot-region-scheduler", "set", "src-tolerance-ratio", "1.02"}, nil)
@@ -277,6 +279,18 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 	mustExec([]string{"-u", pdAddr, "scheduler", "config", "balance-hot-region-scheduler"}, &conf1)
 	c.Assert(conf1, DeepEquals, expected1)
 
+	mustExec([]string{"-u", pdAddr, "scheduler", "config", "balance-hot-region-scheduler", "set", "read-priorities", "key"}, nil)
+	expected1["read-priorities"] = []interface{}{"key"}
+	mustExec([]string{"-u", pdAddr, "scheduler", "config", "balance-hot-region-scheduler"}, &conf1)
+	c.Assert(conf1, DeepEquals, expected1)
+	mustExec([]string{"-u", pdAddr, "scheduler", "config", "balance-hot-region-scheduler", "set", "read-priorities", "key,byte"}, nil)
+	expected1["read-priorities"] = []interface{}{"key", "byte"}
+	mustExec([]string{"-u", pdAddr, "scheduler", "config", "balance-hot-region-scheduler"}, &conf1)
+	c.Assert(conf1, DeepEquals, expected1)
+	mustExec([]string{"-u", pdAddr, "scheduler", "config", "balance-hot-region-scheduler", "set", "read-priorities", "foo,bar"}, nil)
+	mustExec([]string{"-u", pdAddr, "scheduler", "config", "balance-hot-region-scheduler"}, &conf1)
+	c.Assert(conf1, DeepEquals, expected1)
+
 	// test show scheduler with paused and disabled status.
 	checkSchedulerWithStatusCommand := func(args []string, status string, expected []string) {
 		if args != nil {

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

@@ -25,6 +25,7 @@ import (
 
 	"github.com/pingcap/errors"
 	"github.com/spf13/cobra"
+	"github.com/tikv/pd/server/schedulers"
 )
 
 var (
@@ -527,7 +528,22 @@ func postSchedulerConfigCommandFunc(cmd *cobra.Command, schedulerName string, ar
 	if err != nil {
 		val = value
 	}
-	input[key] = val
+	if schedulerName == "balance-hot-region-scheduler" && (key == "read-priorities" || key == "write-priorities") {
+		priorities := make([]string, 0)
+		for _, priority := range strings.Split(value, ",") {
+			if priority != schedulers.BytePriority && priority != schedulers.KeyPriority {
+				cmd.Println(fmt.Sprintf("priority should be one of %s,%s,%s",
+					schedulers.BytePriority,
+					schedulers.KeyPriority,
+					"none"))
+				return
+			}
+			priorities = append(priorities, priority)
+		}
+		input[key] = priorities
+	} else {
+		input[key] = val
+	}
 	postJSON(cmd, path.Join(schedulerConfigPrefix, schedulerName, "config"), input)
 }