Merge branch 'master' into RawKV_GC_API_storage

server/cluster/coordinator_test.go

@@ -656,10 +656,11 @@ func (s *testCoordinatorSuite) TestAddScheduler(c *C) {
 	tc, co, cleanup := prepare(nil, nil, func(co *coordinator) { co.run() }, c)
 	defer cleanup()
 
-	c.Assert(co.schedulers, HasLen, 3)
+	c.Assert(co.schedulers, HasLen, len(config.DefaultSchedulers))
 	c.Assert(co.removeScheduler(schedulers.BalanceLeaderName), IsNil)
 	c.Assert(co.removeScheduler(schedulers.BalanceRegionName), IsNil)
 	c.Assert(co.removeScheduler(schedulers.HotRegionName), IsNil)
+	c.Assert(co.removeScheduler(schedulers.SplitBucketName), IsNil)
 	c.Assert(co.schedulers, HasLen, 0)
 
 	stream := mockhbstream.NewHeartbeatStream()
@@ -722,7 +723,7 @@ func (s *testCoordinatorSuite) TestPersistScheduler(c *C) {
 	c.Assert(tc.addLeaderStore(1, 1), IsNil)
 	c.Assert(tc.addLeaderStore(2, 1), IsNil)
 
-	c.Assert(co.schedulers, HasLen, 3)
+	c.Assert(co.schedulers, HasLen, 4)
 	oc := co.opController
 	storage := tc.RaftCluster.storage
 
@@ -732,13 +733,14 @@ func (s *testCoordinatorSuite) TestPersistScheduler(c *C) {
 	evict, err := schedule.CreateScheduler(schedulers.EvictLeaderType, oc, storage, schedule.ConfigSliceDecoder(schedulers.EvictLeaderType, []string{"2"}))
 	c.Assert(err, IsNil)
 	c.Assert(co.addScheduler(evict, "2"), IsNil)
-	c.Assert(co.schedulers, HasLen, 5)
+	c.Assert(co.schedulers, HasLen, 6)
 	sches, _, err := storage.LoadAllScheduleConfig()
 	c.Assert(err, IsNil)
-	c.Assert(sches, HasLen, 5)
+	c.Assert(sches, HasLen, 6)
 	c.Assert(co.removeScheduler(schedulers.BalanceLeaderName), IsNil)
 	c.Assert(co.removeScheduler(schedulers.BalanceRegionName), IsNil)
 	c.Assert(co.removeScheduler(schedulers.HotRegionName), IsNil)
+	c.Assert(co.removeScheduler(schedulers.SplitBucketName), IsNil)
 	c.Assert(co.schedulers, HasLen, 2)
 	c.Assert(co.cluster.opt.Persist(storage), IsNil)
 	co.stop()
@@ -754,15 +756,15 @@ func (s *testCoordinatorSuite) TestPersistScheduler(c *C) {
 	defer func() {
 		config.DefaultSchedulers = config.DefaultSchedulers[:len(config.DefaultSchedulers)-1]
 	}()
-	c.Assert(newOpt.GetSchedulers(), HasLen, 3)
+	c.Assert(newOpt.GetSchedulers(), HasLen, 4)
 	c.Assert(newOpt.Reload(storage), IsNil)
 	// only remains 3 items with independent config.
 	sches, _, err = storage.LoadAllScheduleConfig()
 	c.Assert(err, IsNil)
 	c.Assert(sches, HasLen, 3)
 
 	// option have 6 items because the default scheduler do not remove.
-	c.Assert(newOpt.GetSchedulers(), HasLen, 6)
+	c.Assert(newOpt.GetSchedulers(), HasLen, 7)
 	c.Assert(newOpt.Persist(storage), IsNil)
 	tc.RaftCluster.opt = newOpt
 
@@ -789,10 +791,10 @@ func (s *testCoordinatorSuite) TestPersistScheduler(c *C) {
 
 	// the scheduler option should contain 6 items
 	// the `hot scheduler` are disabled
-	c.Assert(co.cluster.opt.GetSchedulers(), HasLen, 6)
+	c.Assert(co.cluster.opt.GetSchedulers(), HasLen, 7)
 	c.Assert(co.removeScheduler(schedulers.GrantLeaderName), IsNil)
 	// the scheduler that is not enable by default will be completely deleted
-	c.Assert(co.cluster.opt.GetSchedulers(), HasLen, 5)
+	c.Assert(co.cluster.opt.GetSchedulers(), HasLen, 6)
 	c.Assert(co.schedulers, HasLen, 4)
 	c.Assert(co.cluster.opt.Persist(co.cluster.storage), IsNil)
 	co.stop()
@@ -820,23 +822,24 @@ func (s *testCoordinatorSuite) TestRemoveScheduler(c *C) {
 	c.Assert(tc.addLeaderStore(1, 1), IsNil)
 	c.Assert(tc.addLeaderStore(2, 1), IsNil)
 
-	c.Assert(co.schedulers, HasLen, 3)
+	c.Assert(co.schedulers, HasLen, 4)
 	oc := co.opController
 	storage := tc.RaftCluster.storage
 
 	gls1, err := schedule.CreateScheduler(schedulers.GrantLeaderType, oc, storage, schedule.ConfigSliceDecoder(schedulers.GrantLeaderType, []string{"1"}))
 	c.Assert(err, IsNil)
 	c.Assert(co.addScheduler(gls1, "1"), IsNil)
-	c.Assert(co.schedulers, HasLen, 4)
+	c.Assert(co.schedulers, HasLen, 5)
 	sches, _, err := storage.LoadAllScheduleConfig()
 	c.Assert(err, IsNil)
-	c.Assert(sches, HasLen, 4)
+	c.Assert(sches, HasLen, 5)
 
 	// remove all schedulers
 	c.Assert(co.removeScheduler(schedulers.BalanceLeaderName), IsNil)
 	c.Assert(co.removeScheduler(schedulers.BalanceRegionName), IsNil)
 	c.Assert(co.removeScheduler(schedulers.HotRegionName), IsNil)
 	c.Assert(co.removeScheduler(schedulers.GrantLeaderName), IsNil)
+	c.Assert(co.removeScheduler(schedulers.SplitBucketName), IsNil)
 	// all removed
 	sches, _, err = storage.LoadAllScheduleConfig()
 	c.Assert(err, IsNil)
@@ -855,7 +858,7 @@ func (s *testCoordinatorSuite) TestRemoveScheduler(c *C) {
 	co.run()
 	c.Assert(co.schedulers, HasLen, 0)
 	// the option remains default scheduler
-	c.Assert(co.cluster.opt.GetSchedulers(), HasLen, 3)
+	c.Assert(co.cluster.opt.GetSchedulers(), HasLen, 4)
 	co.stop()
 	co.wg.Wait()
 }

server/config/config.go

@@ -1017,6 +1017,7 @@ var DefaultSchedulers = SchedulerConfigs{
 	{Type: "balance-region"},
 	{Type: "balance-leader"},
 	{Type: "hot-region"},
+	{Type: "split-bucket"},
 }
 
 // IsDefaultScheduler checks whether the scheduler is enable by default.

server/config/config_test.go

@@ -83,7 +83,7 @@ func (s *testConfigSuite) TestReloadConfig(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(newOpt.Reload(storage), IsNil)
 	schedulers := newOpt.GetSchedulers()
-	c.Assert(schedulers, HasLen, 4)
+	c.Assert(schedulers, HasLen, len(DefaultSchedulers))
 	c.Assert(newOpt.IsUseRegionStorage(), IsTrue)
 	for i, s := range schedulers {
 		c.Assert(s.Type, Equals, DefaultSchedulers[i].Type)

server/config/store_config.go

@@ -54,9 +54,10 @@ type Coprocessor struct {
 	// split by RegionSplitSize.
 	RegionMaxSize string `json:"region-max-size"`
 	// RegionSplitSize is the split size of a region, region will according to this value to split.
-	RegionSplitSize string `json:"region-split-size"`
-	RegionMaxKeys   int    `json:"region-max-keys"`
-	RegionSplitKeys int    `json:"region-split-keys"`
+	RegionSplitSize    string `json:"region-split-size"`
+	RegionMaxKeys      int    `json:"region-max-keys"`
+	RegionSplitKeys    int    `json:"region-split-keys"`
+	EnableRegionBucket bool   `json:"enable-region-bucket"`
 }
 
 // String implements fmt.Stringer interface.
@@ -68,6 +69,14 @@ func (c *StoreConfig) String() string {
 	return string(data)
 }
 
+// EnableRegionBucket return ture if the region bucket is enabled.
+func (c *StoreConfig) EnableRegionBucket() bool {
+	if c == nil {
+		return false
+	}
+	return c.Coprocessor.EnableRegionBucket
+}
+
 // GetRegionMaxSize returns the max region size in MB
 func (c *StoreConfig) GetRegionMaxSize() uint64 {
 	if c == nil || len(c.Coprocessor.RegionMaxSize) == 0 {

server/schedulers/split_bucket.go

@@ -168,7 +168,10 @@ func (s *splitBucketScheduler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 }
 
 // IsScheduleAllowed return true if the sum of executing opSplit operator is less  .
-func (s *splitBucketScheduler) IsScheduleAllowed(_ schedule.Cluster) bool {
+func (s *splitBucketScheduler) IsScheduleAllowed(cluster schedule.Cluster) bool {
+	if !cluster.GetStoreConfig().EnableRegionBucket() {
+		schedulerCounter.WithLabelValues(s.GetName(), "bucket-disable").Inc()
+	}
 	allowed := s.BaseScheduler.OpController.OperatorCount(operator.OpSplit) < s.conf.SplitLimit
 	if !allowed {
 		operator.OperatorLimitCounter.WithLabelValues(s.GetType(), operator.OpSplit.String()).Inc()

tests/pdctl/scheduler/scheduler_test.go

@@ -135,6 +135,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 		"balance-region-scheduler":     true,
 		"balance-leader-scheduler":     true,
 		"balance-hot-region-scheduler": true,
+		"split-bucket-scheduler":       true,
 	}
 	checkSchedulerCommand(nil, expected)
 
@@ -143,6 +144,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 	expected = map[string]bool{
 		"balance-leader-scheduler":     true,
 		"balance-hot-region-scheduler": true,
+		"split-bucket-scheduler":       true,
 	}
 	checkSchedulerCommand(args, expected)
 
@@ -154,6 +156,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 		expected = map[string]bool{
 			"balance-leader-scheduler":     true,
 			"balance-hot-region-scheduler": true,
+			"split-bucket-scheduler":       true,
 			schedulers[idx]:                true,
 		}
 		checkSchedulerCommand(args, expected)
@@ -168,6 +171,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 		expected = map[string]bool{
 			"balance-leader-scheduler":     true,
 			"balance-hot-region-scheduler": true,
+			"split-bucket-scheduler":       true,
 			schedulers[idx]:                true,
 		}
 		checkSchedulerCommand(args, expected)
@@ -181,6 +185,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 		expected = map[string]bool{
 			"balance-leader-scheduler":     true,
 			"balance-hot-region-scheduler": true,
+			"split-bucket-scheduler":       true,
 		}
 		checkSchedulerCommand(args, expected)
 
@@ -190,6 +195,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 		expected = map[string]bool{
 			"balance-leader-scheduler":     true,
 			"balance-hot-region-scheduler": true,
+			"split-bucket-scheduler":       true,
 			schedulers[idx]:                true,
 		}
 		checkSchedulerCommand(args, expected)
@@ -199,6 +205,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 		expected = map[string]bool{
 			"balance-leader-scheduler":     true,
 			"balance-hot-region-scheduler": true,
+			"split-bucket-scheduler":       true,
 			schedulers[idx]:                true,
 		}
 		checkSchedulerCommand(args, expected)
@@ -212,6 +219,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 		expected = map[string]bool{
 			"balance-leader-scheduler":     true,
 			"balance-hot-region-scheduler": true,
+			"split-bucket-scheduler":       true,
 			schedulers[idx]:                true,
 		}
 		checkSchedulerCommand(args, expected)
@@ -225,6 +233,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 		expected = map[string]bool{
 			"balance-leader-scheduler":     true,
 			"balance-hot-region-scheduler": true,
+			"split-bucket-scheduler":       true,
 		}
 		checkSchedulerCommand(args, expected)
 	}
@@ -233,6 +242,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 	checkSchedulerCommand([]string{"-u", pdAddr, "scheduler", "add", "shuffle-region-scheduler"}, map[string]bool{
 		"balance-leader-scheduler":     true,
 		"balance-hot-region-scheduler": true,
+		"split-bucket-scheduler":       true,
 		"shuffle-region-scheduler":     true,
 	})
 	var roles []string
@@ -248,6 +258,7 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 	checkSchedulerCommand([]string{"-u", pdAddr, "scheduler", "add", "grant-hot-region-scheduler", "1", "1,2,3"}, map[string]bool{
 		"balance-leader-scheduler":     true,
 		"balance-hot-region-scheduler": true,
+		"split-bucket-scheduler":       true,
 		"shuffle-region-scheduler":     true,
 		"grant-hot-region-scheduler":   true,
 	})
@@ -422,8 +433,6 @@ func (s *schedulerTestSuite) TestScheduler(c *C) {
 	checkSchedulerWithStatusCommand(nil, "disabled", nil)
 
 	// test split bucket scheduler
-	echo = mustExec([]string{"-u", pdAddr, "scheduler", "add", "split-bucket-scheduler"}, nil)
-	c.Assert(strings.Contains(echo, "Success!"), IsTrue)
 	echo = mustExec([]string{"-u", pdAddr, "scheduler", "config", "split-bucket-scheduler"}, nil)
 	c.Assert(strings.Contains(echo, "\"degree\": 3"), IsTrue)
 	echo = mustExec([]string{"-u", pdAddr, "scheduler", "config", "split-bucket-scheduler", "set", "degree", "10"}, nil)