address the comment

Signed-off-by: yisaer <disxiaofei@163.com>
tikv · Jul 27, 2021 · 807a828 · 807a828
1 parent fcd72d2
commit 807a828
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/server/schedulers/hot_region_config.go b/server/schedulers/hot_region_config.go
@@ -31,8 +31,6 @@ import (
 )
 
 const (
-	// NonePriority indicates there is no dim priority for hot-region-scheduler
-	NonePriority = ""
 	// BytePriority indicates hot-region-scheduler prefer byte dim
 	BytePriority = "byte"
 	// KeyPriority indicates hot-region-scheduler prefer key dim
@@ -54,8 +52,8 @@ func initHotRegionScheduleConfig() *hotRegionSchedulerConfig {
 		MaxPeerNum:             1000,
 		SrcToleranceRatio:      1.05, // Tolerate 5% difference
 		DstToleranceRatio:      1.05, // Tolerate 5% difference
-		ReadPriorities:         []string{},
-		WritePriorities:        []string{},
+		ReadPriorities:         []string{KeyPriority, BytePriority},
+		WritePriorities:        []string{BytePriority, KeyPriority},
 	}
 }
 

diff --git a/tools/pd-ctl/pdctl/command/scheduler.go b/tools/pd-ctl/pdctl/command/scheduler.go
@@ -530,17 +530,15 @@ func postSchedulerConfigCommandFunc(cmd *cobra.Command, schedulerName string, ar
 	}
 	if schedulerName == "balance-hot-region-scheduler" && (key == "read-priorities" || key == "write-priorities") {
 		priorities := make([]string, 0)
-		if value != "none" {
-			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)
+		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 {