change all name to kebab-case (#772)

conf/config.toml

@@ -52,15 +52,14 @@ region-schedule-limit = 16
 replica-schedule-limit = 24
 
 # customized schedulers, the format is as below
-# if empty, it will use balanceLeader, balanceRegion, hotReadRegion, hotWriteRegion as default
+# if empty, it will use balance-leader, balance-region, hot-region as default
 [schedule.schedulers]
-# [schedule.schedulers.balanceLeader]
+# [schedule.schedulers.balance-leader]
 #		
-# [schedule.schedulers.balanceRegion]
+# [schedule.schedulers.balance-region]
 #		
-# [schedule.schedulers.hotWriteRegion]
-#
-# [schedule.schedulers.hotReadRegion]
+# [schedule.schedulers.hot-region]
+
 
 
 [replication]

server/balancer_test.go

@@ -273,7 +273,7 @@ func (s *testBalanceLeaderSchedulerSuite) SetUpTest(c *C) {
 	s.cluster = newClusterInfo(newMockIDAllocator())
 	s.tc = newTestClusterInfo(s.cluster)
 	_, opt := newTestScheduleConfig()
-	lb, err := schedule.CreateScheduler("balanceLeader", opt)
+	lb, err := schedule.CreateScheduler("balance-leader", opt)
 	c.Assert(err, IsNil)
 	s.lb = lb
 }
@@ -407,7 +407,7 @@ func (s *testBalanceRegionSchedulerSuite) TestBalance(c *C) {
 	tc := newTestClusterInfo(cluster)
 
 	_, opt := newTestScheduleConfig()
-	sb, err := schedule.CreateScheduler("balanceRegion", opt)
+	sb, err := schedule.CreateScheduler("balance-region", opt)
 	c.Assert(err, IsNil)
 
 	opt.SetMaxReplicas(1)
@@ -446,7 +446,7 @@ func (s *testBalanceRegionSchedulerSuite) TestReplicas3(c *C) {
 	_, opt := newTestScheduleConfig()
 	opt.rep = newTestReplication(3, "zone", "rack", "host")
 
-	sb, err := schedule.CreateScheduler("balanceRegion", opt)
+	sb, err := schedule.CreateScheduler("balance-region", opt)
 	c.Assert(err, IsNil)
 
 	// Store 1 has the largest region score, so the balancer try to replace peer in store 1.
@@ -511,7 +511,7 @@ func (s *testBalanceRegionSchedulerSuite) TestReplicas5(c *C) {
 	_, opt := newTestScheduleConfig()
 	opt.rep = newTestReplication(5, "zone", "rack", "host")
 
-	sb, err := schedule.CreateScheduler("balanceRegion", opt)
+	sb, err := schedule.CreateScheduler("balance-region", opt)
 	c.Assert(err, IsNil)
 
 	tc.addLabelsStore(1, 4, map[string]string{"zone": "z1", "rack": "r1", "host": "h1"})
@@ -547,7 +547,7 @@ func (s *testBalanceRegionSchedulerSuite) TestStoreWeight(c *C) {
 	tc := newTestClusterInfo(cluster)
 
 	_, opt := newTestScheduleConfig()
-	sb, err := schedule.CreateScheduler("balanceRegion", opt)
+	sb, err := schedule.CreateScheduler("balance-region", opt)
 	c.Assert(err, IsNil)
 	opt.SetMaxReplicas(1)
 
@@ -878,7 +878,7 @@ func (s *testBalanceHotWriteRegionSchedulerSuite) TestBalance(c *C) {
 	tc := newTestClusterInfo(cluster)
 
 	_, opt := newTestScheduleConfig()
-	hb, err := schedule.CreateScheduler("hotWriteRegion", opt)
+	hb, err := schedule.CreateScheduler("hot-write-region", opt)
 	c.Assert(err, IsNil)
 
 	// Add stores 1, 2, 3, 4, 5 with region counts 3, 2, 2, 2, 0.
@@ -959,7 +959,7 @@ func (s *testBalanceHotReadRegionSchedulerSuite) TestBalance(c *C) {
 	tc := newTestClusterInfo(cluster)
 
 	_, opt := newTestScheduleConfig()
-	hb, err := schedule.CreateScheduler("hotReadRegion", opt)
+	hb, err := schedule.CreateScheduler("hot-read-region", opt)
 	c.Assert(err, IsNil)
 
 	// Add stores 1, 2, 3, 4, 5 with region counts 3, 2, 2, 2, 0.

server/config.go

@@ -327,9 +327,9 @@ const (
 )
 
 var defaultSchedulers = SchedulerConfigs{
-	"balanceRegion": toml.Primitive{},
-	"balanceLeader": toml.Primitive{},
-	"hotRegion":     toml.Primitive{},
+	"balance-region": toml.Primitive{},
+	"balance-leader": toml.Primitive{},
+	"hot-region":     toml.Primitive{},
 }
 
 func (c *ScheduleConfig) adjust() {

server/coordinator_test.go

@@ -329,12 +329,12 @@ func (s *testCoordinatorSuite) TestAddScheduler(c *C) {
 	// Add regions 3 with leader in store 3 and followers in stores 1,2
 	tc.addLeaderRegion(3, 3, 1, 2)
 
-	gls, err := schedule.CreateScheduler("grantLeader", opt, "0")
+	gls, err := schedule.CreateScheduler("grant-leader", opt, "0")
 	c.Assert(err, IsNil)
 	c.Assert(co.addScheduler(gls, schedule.MinScheduleInterval), NotNil)
 	c.Assert(co.removeScheduler(gls.GetName()), NotNil)
 
-	gls, err = schedule.CreateScheduler("grantLeader", opt, "1")
+	gls, err = schedule.CreateScheduler("grant-leader", opt, "1")
 	c.Assert(err, IsNil)
 	c.Assert(co.addScheduler(gls, schedule.MinScheduleInterval), IsNil)
 
@@ -446,7 +446,7 @@ func (s *testScheduleControllerSuite) TestController(c *C) {
 	hbStreams := newHeartbeatStreams(cluster.getClusterID())
 	defer hbStreams.Close()
 	co := newCoordinator(cluster, opt, hbStreams)
-	scheduler, err := schedule.CreateScheduler("balanceLeader", opt)
+	scheduler, err := schedule.CreateScheduler("balance-leader", opt)
 	c.Assert(err, IsNil)
 	lb := &mockLimitScheduler{
 		Scheduler: scheduler,
@@ -503,7 +503,7 @@ func (s *testScheduleControllerSuite) TestInterval(c *C) {
 	hbStreams := newHeartbeatStreams(cluster.getClusterID())
 	defer hbStreams.Close()
 	co := newCoordinator(cluster, opt, hbStreams)
-	lb, err := schedule.CreateScheduler("balanceLeader", opt)
+	lb, err := schedule.CreateScheduler("balance-leader", opt)
 	c.Assert(err, IsNil)
 	sc := newScheduleController(co, lb, schedule.MinScheduleInterval)
 

server/handler.go

@@ -101,7 +101,7 @@ func (h *Handler) RemoveScheduler(name string) error {
 
 // AddBalanceLeaderScheduler adds a balance-leader-scheduler.
 func (h *Handler) AddBalanceLeaderScheduler() error {
-	s, err := schedule.CreateScheduler("balanceLeader", h.opt)
+	s, err := schedule.CreateScheduler("balance-leader", h.opt)
 	if err != nil {
 		return errors.Trace(err)
 	}
@@ -110,7 +110,7 @@ func (h *Handler) AddBalanceLeaderScheduler() error {
 
 // AddGrantLeaderScheduler adds a grant-leader-scheduler.
 func (h *Handler) AddGrantLeaderScheduler(storeID uint64) error {
-	s, err := schedule.CreateScheduler("grantLeader", h.opt, strconv.FormatUint(storeID, 10))
+	s, err := schedule.CreateScheduler("grant-leader", h.opt, strconv.FormatUint(storeID, 10))
 	if err != nil {
 		return errors.Trace(err)
 	}
@@ -119,7 +119,7 @@ func (h *Handler) AddGrantLeaderScheduler(storeID uint64) error {
 
 // AddEvictLeaderScheduler adds an evict-leader-scheduler.
 func (h *Handler) AddEvictLeaderScheduler(storeID uint64) error {
-	s, err := schedule.CreateScheduler("evictLeader", h.opt, strconv.FormatUint(storeID, 10))
+	s, err := schedule.CreateScheduler("evict-leader", h.opt, strconv.FormatUint(storeID, 10))
 	if err != nil {
 		return errors.Trace(err)
 	}
@@ -128,7 +128,7 @@ func (h *Handler) AddEvictLeaderScheduler(storeID uint64) error {
 
 // AddShuffleLeaderScheduler adds a shuffle-leader-scheduler.
 func (h *Handler) AddShuffleLeaderScheduler() error {
-	s, err := schedule.CreateScheduler("shuffleLeader", h.opt)
+	s, err := schedule.CreateScheduler("shuffle-leader", h.opt)
 	if err != nil {
 		return errors.Trace(err)
 	}
@@ -137,7 +137,7 @@ func (h *Handler) AddShuffleLeaderScheduler() error {
 
 // AddShuffleRegionScheduler adds a shuffle-region-scheduler.
 func (h *Handler) AddShuffleRegionScheduler() error {
-	s, err := schedule.CreateScheduler("shuffleRegion", h.opt)
+	s, err := schedule.CreateScheduler("shuffle-region", h.opt)
 	if err != nil {
 		return errors.Trace(err)
 	}

server/scheduler_test.go

@@ -27,7 +27,7 @@ func (s *testShuffleLeaderSuite) TestShuffle(c *C) {
 	tc := newTestClusterInfo(cluster)
 
 	_, opt := newTestScheduleConfig()
-	sl, err := schedule.CreateScheduler("shuffleLeader", opt)
+	sl, err := schedule.CreateScheduler("shuffle-leader", opt)
 	c.Assert(err, IsNil)
 	c.Assert(sl.Schedule(cluster), IsNil)
 

server/schedulers/balance_leader.go

@@ -21,7 +21,7 @@ import (
 )
 
 func init() {
-	schedule.RegisterScheduler("balanceLeader", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
+	schedule.RegisterScheduler("balance-leader", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
 		return newBalanceLeaderScheduler(opt), nil
 	})
 }
@@ -89,5 +89,5 @@ func (l *balanceLeaderScheduler) Schedule(cluster schedule.Cluster) *schedule.Op
 	l.limit = adjustBalanceLimit(cluster, l.GetResourceKind())
 	schedulerCounter.WithLabelValues(l.GetName(), "new_opeartor").Inc()
 	step := schedule.TransferLeader{FromStore: region.Leader.GetStoreId(), ToStore: newLeader.GetStoreId()}
-	return schedule.NewOperator("balanceLeader", region.GetId(), core.LeaderKind, step)
+	return schedule.NewOperator("balance-leader", region.GetId(), core.LeaderKind, step)
 }

server/schedulers/balance_region.go

@@ -23,7 +23,7 @@ import (
 )
 
 func init() {
-	schedule.RegisterScheduler("balanceRegion", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
+	schedule.RegisterScheduler("balance-region", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
 		return newBalanceRegionScheduler(opt), nil
 	})
 }
@@ -127,7 +127,7 @@ func (s *balanceRegionScheduler) transferPeer(cluster schedule.Cluster, region *
 	}
 	s.limit = adjustBalanceLimit(cluster, s.GetResourceKind())
 
-	return schedule.CreateMovePeerOperator("balanceRegion", region, core.RegionKind, oldPeer.GetStoreId(), newPeer.GetStoreId(), newPeer.GetId())
+	return schedule.CreateMovePeerOperator("balance-region", region, core.RegionKind, oldPeer.GetStoreId(), newPeer.GetStoreId(), newPeer.GetId())
 }
 
 // GetCache returns interval id cache in the scheduler. This is for test only.

server/schedulers/evict_leader.go

@@ -24,9 +24,9 @@ import (
 )
 
 func init() {
-	schedule.RegisterScheduler("evictLeader", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
+	schedule.RegisterScheduler("evict-leader", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
 		if len(args) != 1 {
-			return nil, errors.New("evictLeader needs 1 argument")
+			return nil, errors.New("evict-leader needs 1 argument")
 		}
 		id, err := strconv.ParseUint(args[0], 10, 64)
 		if err != nil {
@@ -97,5 +97,5 @@ func (s *evictLeaderScheduler) Schedule(cluster schedule.Cluster) *schedule.Oper
 	}
 	schedulerCounter.WithLabelValues(s.GetName(), "new_operator").Inc()
 	step := schedule.TransferLeader{FromStore: region.Leader.GetStoreId(), ToStore: target.GetId()}
-	return schedule.NewOperator("evictLeader", region.GetId(), core.LeaderKind, step)
+	return schedule.NewOperator("evict-leader", region.GetId(), core.LeaderKind, step)
 }

server/schedulers/grant_leader.go

@@ -24,9 +24,9 @@ import (
 )
 
 func init() {
-	schedule.RegisterScheduler("grantLeader", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
+	schedule.RegisterScheduler("grant-leader", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
 		if len(args) != 1 {
-			return nil, errors.New("grantLeader needs 1 argument")
+			return nil, errors.New("grant-leader needs 1 argument")
 		}
 		id, err := strconv.ParseUint(args[0], 10, 64)
 		if err != nil {
@@ -88,5 +88,5 @@ func (s *grantLeaderScheduler) Schedule(cluster schedule.Cluster) *schedule.Oper
 	}
 	schedulerCounter.WithLabelValues(s.GetName(), "new_operator").Inc()
 	step := schedule.TransferLeader{FromStore: region.Leader.GetStoreId(), ToStore: s.storeID}
-	return schedule.NewOperator("grantLeader", region.GetId(), core.LeaderKind, step)
+	return schedule.NewOperator("grant-leader", region.GetId(), core.LeaderKind, step)
 }

server/schedulers/hot_region.go

@@ -26,14 +26,14 @@ import (
 )
 
 func init() {
-	schedule.RegisterScheduler("hotRegion", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
+	schedule.RegisterScheduler("hot-region", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
 		return newBalanceHotRegionsScheduler(opt), nil
 	})
 	// FIXME: remove this two schedule after the balance test move in schedulers package
-	schedule.RegisterScheduler("hotWriteRegion", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
+	schedule.RegisterScheduler("hot-write-region", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
 		return newBalanceHotWriteRegionsScheduler(opt), nil
 	})
-	schedule.RegisterScheduler("hotReadRegion", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
+	schedule.RegisterScheduler("hot-read-region", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
 		return newBalanceHotReadRegionsScheduler(opt), nil
 	})
 }

server/schedulers/shuffle_leader.go

@@ -22,7 +22,7 @@ import (
 )
 
 func init() {
-	schedule.RegisterScheduler("shuffleLeader", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
+	schedule.RegisterScheduler("shuffle-leader", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
 		return newShuffleLeaderScheduler(opt), nil
 	})
 }
@@ -85,7 +85,7 @@ func (s *shuffleLeaderScheduler) Schedule(cluster schedule.Cluster) *schedule.Op
 		s.selected = region.Leader
 		schedulerCounter.WithLabelValues(s.GetName(), "new_operator").Inc()
 		step := schedule.TransferLeader{FromStore: region.Leader.GetStoreId(), ToStore: newLeader.GetStoreId()}
-		return schedule.NewOperator("shuffleLeader", region.GetId(), core.LeaderKind, step)
+		return schedule.NewOperator("shuffle-leader", region.GetId(), core.LeaderKind, step)
 	}
 
 	// Reset the selected store.

server/schedulers/shuffle_region.go

@@ -21,7 +21,7 @@ import (
 )
 
 func init() {
-	schedule.RegisterScheduler("shuffleRegion", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
+	schedule.RegisterScheduler("shuffle-region", func(opt schedule.Options, args []string) (schedule.Scheduler, error) {
 		return newShuffleRegionScheduler(opt), nil
 	})
 }
@@ -81,5 +81,5 @@ func (s *shuffleRegionScheduler) Schedule(cluster schedule.Cluster) *schedule.Op
 	}
 
 	schedulerCounter.WithLabelValues(s.GetName(), "new_operator").Inc()
-	return schedule.CreateMovePeerOperator("shuffleRegion", region, core.RegionKind, oldPeer.GetStoreId(), newPeer.GetStoreId(), newPeer.GetId())
+	return schedule.CreateMovePeerOperator("shuffle-region", region, core.RegionKind, oldPeer.GetStoreId(), newPeer.GetStoreId(), newPeer.GetId())
 }