Skip to content

Commit

Permalink
server: unify the format of operators' descriptions (#1498)
Browse files Browse the repository at this point in the history 
Signed-off-by: Ryan Leung <[email protected]>
  • Loading branch information
@rleungx
rleungx authored Apr 9, 2019
1 parent 8988497 commit 9ba0e44
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion server/coordinator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (c *coordinator) checkRegion(region *core.RegionInfo) bool {
ToStore: p.GetStoreId(),
PeerID: p.GetId(),
}
op := schedule.NewOperator("promoteLearner", region.GetID(), region.GetRegionEpoch(), schedule.OpRegion, step)
op := schedule.NewOperator("promote-learner", region.GetID(), region.GetRegionEpoch(), schedule.OpRegion, step)
if opController.AddOperator(op) {
return true
}
Expand Down
16 changes: 8 additions & 8 deletions server/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ func (h *Handler) AddTransferLeaderOperator(regionID uint64, storeID uint64) err
}

step := schedule.TransferLeader{FromStore: region.GetLeader().GetStoreId(), ToStore: newLeader.GetStoreId()}
op := schedule.NewOperator("adminTransferLeader", regionID, region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpLeader, step)
op := schedule.NewOperator("admin-transfer-leader", regionID, region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpLeader, step)
if ok := c.opController.AddOperator(op); !ok {
return errors.WithStack(ErrAddOperator)
}
Expand Down Expand Up @@ -405,7 +405,7 @@ func (h *Handler) AddTransferRegionOperator(regionID uint64, storeIDs map[uint64
steps = append(steps, schedule.RemovePeer{FromStore: peer.GetStoreId()})
}

op := schedule.NewOperator("adminMoveRegion", regionID, region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpRegion, steps...)
op := schedule.NewOperator("admin-move-region", regionID, region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpRegion, steps...)
if ok := c.opController.AddOperator(op); !ok {
return errors.WithStack(ErrAddOperator)
}
Expand Down Expand Up @@ -442,7 +442,7 @@ func (h *Handler) AddTransferPeerOperator(regionID uint64, fromStoreID, toStoreI
return err
}

op, err := schedule.CreateMovePeerOperator("adminMovePeer", c.cluster, region, schedule.OpAdmin, fromStoreID, toStoreID, newPeer.GetId())
op, err := schedule.CreateMovePeerOperator("admin-move-peer", c.cluster, region, schedule.OpAdmin, fromStoreID, toStoreID, newPeer.GetId())
if err != nil {
return err
}
Expand Down Expand Up @@ -502,7 +502,7 @@ func (h *Handler) AddAddPeerOperator(regionID uint64, toStoreID uint64) error {
schedule.AddPeer{ToStore: toStoreID, PeerID: newPeer.GetId()},
}
}
op := schedule.NewOperator("adminAddPeer", regionID, region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpRegion, steps...)
op := schedule.NewOperator("admin-add-peer", regionID, region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpRegion, steps...)
if ok := c.opController.AddOperator(op); !ok {
return errors.WithStack(ErrAddOperator)
}
Expand All @@ -528,7 +528,7 @@ func (h *Handler) AddAddLearnerOperator(regionID uint64, toStoreID uint64) error
steps := []schedule.OperatorStep{
schedule.AddLearner{ToStore: toStoreID, PeerID: newPeer.GetId()},
}
op := schedule.NewOperator("adminAddPeer", regionID, region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpRegion, steps...)
op := schedule.NewOperator("admin-add-peer", regionID, region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpRegion, steps...)
if ok := c.opController.AddOperator(op); !ok {
return errors.WithStack(ErrAddOperator)
}
Expand All @@ -551,7 +551,7 @@ func (h *Handler) AddRemovePeerOperator(regionID uint64, fromStoreID uint64) err
return errors.Errorf("region has no peer in store %v", fromStoreID)
}

op, err := schedule.CreateRemovePeerOperator("adminRemovePeer", c.cluster, schedule.OpAdmin, region, fromStoreID)
op, err := schedule.CreateRemovePeerOperator("admin-remove-peer", c.cluster, schedule.OpAdmin, region, fromStoreID)
if err != nil {
return err
}
Expand Down Expand Up @@ -594,7 +594,7 @@ func (h *Handler) AddMergeRegionOperator(regionID uint64, targetID uint64) error
return ErrRegionNotAdjacent
}

ops, err := schedule.CreateMergeRegionOperator("adminMergeRegion", c.cluster, region, target, schedule.OpAdmin)
ops, err := schedule.CreateMergeRegionOperator("admin-merge-region", c.cluster, region, target, schedule.OpAdmin)
if err != nil {
return err
}
Expand All @@ -621,7 +621,7 @@ func (h *Handler) AddSplitRegionOperator(regionID uint64, policy string) error {
EndKey: region.GetEndKey(),
Policy: pdpb.CheckPolicy(pdpb.CheckPolicy_value[strings.ToUpper(policy)]),
}
op := schedule.NewOperator("adminSplitRegion", regionID, region.GetRegionEpoch(), schedule.OpAdmin, step)
op := schedule.NewOperator("admin-split-region", regionID, region.GetRegionEpoch(), schedule.OpAdmin, step)
if ok := c.opController.AddOperator(op); !ok {
return errors.WithStack(ErrAddOperator)
}
Expand Down
2 changes: 1 addition & 1 deletion server/schedule/namespace_checker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (n *NamespaceChecker) Check(region *core.RegionInfo) *Operator {
checkerCounter.WithLabelValues("namespace_checker", "no_target_peer").Inc()
return nil
}
op, err := CreateMovePeerOperator("makeNamespaceRelocation", n.cluster, region, OpReplica, peer.GetStoreId(), newPeer.GetStoreId(), newPeer.GetId())
op, err := CreateMovePeerOperator("make-namespace-relocation", n.cluster, region, OpReplica, peer.GetStoreId(), newPeer.GetStoreId(), newPeer.GetId())
if err != nil {
checkerCounter.WithLabelValues("namespace_checker", "create_operator_fail").Inc()
return nil
Expand Down
8 changes: 4 additions & 4 deletions server/schedule/operator_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ func (t *testOperatorControllerSuite) TestGetOpInfluence(c *C) {
steps := []OperatorStep{
RemovePeer{FromStore: 2},
}
op1 := NewOperator("testOperator", 1, &metapb.RegionEpoch{}, OpRegion, steps...)
op2 := NewOperator("testOperator", 2, &metapb.RegionEpoch{}, OpRegion, steps...)
op1 := NewOperator("test", 1, &metapb.RegionEpoch{}, OpRegion, steps...)
op2 := NewOperator("test", 2, &metapb.RegionEpoch{}, OpRegion, steps...)
oc.SetOperator(op1)
oc.SetOperator(op2)
go func() {
Expand Down Expand Up @@ -73,8 +73,8 @@ func (t *testOperatorControllerSuite) TestOperatorStatus(c *C) {
RemovePeer{FromStore: 2},
AddPeer{ToStore: 2, PeerID: 4},
}
op1 := NewOperator("testOperator", 1, &metapb.RegionEpoch{}, OpRegion, steps...)
op2 := NewOperator("testOperator", 2, &metapb.RegionEpoch{}, OpRegion, steps...)
op1 := NewOperator("test", 1, &metapb.RegionEpoch{}, OpRegion, steps...)
op2 := NewOperator("test", 2, &metapb.RegionEpoch{}, OpRegion, steps...)
region1 := tc.GetRegion(1)
region2 := tc.GetRegion(2)
oc.SetOperator(op1)
Expand Down
2 changes: 1 addition & 1 deletion server/schedule/operator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (s *testOperatorSuite) TestOperatorStep(c *C) {
}

func (s *testOperatorSuite) newTestOperator(regionID uint64, kind OperatorKind, steps ...OperatorStep) *Operator {
return NewOperator("testOperator", regionID, &metapb.RegionEpoch{}, OpAdmin|kind, steps...)
return NewOperator("test", regionID, &metapb.RegionEpoch{}, OpAdmin|kind, steps...)
}

func (s *testOperatorSuite) checkSteps(c *C, op *Operator, steps []OperatorStep) {
Expand Down
16 changes: 8 additions & 8 deletions server/schedule/replica_checker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (r *ReplicaChecker) Check(region *core.RegionInfo) *Operator {
}
}
checkerCounter.WithLabelValues("replica_checker", "new_operator").Inc()
return NewOperator("makeUpReplica", region.GetID(), region.GetRegionEpoch(), OpReplica|OpRegion, steps...)
return NewOperator("make-up-replica", region.GetID(), region.GetRegionEpoch(), OpReplica|OpRegion, steps...)
}

// when add learner peer, the number of peer will exceed max replicas for a while,
Expand All @@ -93,7 +93,7 @@ func (r *ReplicaChecker) Check(region *core.RegionInfo) *Operator {
checkerCounter.WithLabelValues("replica_checker", "no_worst_peer").Inc()
return nil
}
op, err := CreateRemovePeerOperator("removeExtraReplica", r.cluster, OpReplica, region, oldPeer.GetStoreId())
op, err := CreateRemovePeerOperator("remove-extra-replica", r.cluster, OpReplica, region, oldPeer.GetStoreId())
if err != nil {
checkerCounter.WithLabelValues("replica_checker", "create_operator_fail").Inc()
return nil
Expand Down Expand Up @@ -182,7 +182,7 @@ func (r *ReplicaChecker) checkDownPeer(region *core.RegionInfo) *Operator {
continue
}

return r.fixPeer(region, peer, "Down")
return r.fixPeer(region, peer, "down")
}
return nil
}
Expand All @@ -207,7 +207,7 @@ func (r *ReplicaChecker) checkOfflinePeer(region *core.RegionInfo) *Operator {
continue
}

return r.fixPeer(region, peer, "Offline")
return r.fixPeer(region, peer, "offline")
}

return nil
Expand Down Expand Up @@ -238,7 +238,7 @@ func (r *ReplicaChecker) checkBestReplacement(region *core.RegionInfo) *Operator
if err != nil {
return nil
}
op, err := CreateMovePeerOperator("moveToBetterLocation", r.cluster, region, OpReplica, oldPeer.GetStoreId(), newPeer.GetStoreId(), newPeer.GetId())
op, err := CreateMovePeerOperator("move-to-better-location", r.cluster, region, OpReplica, oldPeer.GetStoreId(), newPeer.GetStoreId(), newPeer.GetId())
if err != nil {
checkerCounter.WithLabelValues("replica_checker", "create_operator_fail").Inc()
return nil
Expand All @@ -248,7 +248,7 @@ func (r *ReplicaChecker) checkBestReplacement(region *core.RegionInfo) *Operator
}

func (r *ReplicaChecker) fixPeer(region *core.RegionInfo, peer *metapb.Peer, status string) *Operator {
removeExtra := fmt.Sprintf("removeExtra%sReplica", status)
removeExtra := fmt.Sprintf("remove-extra-%s-replica", status)
// Check the number of replicas first.
if len(region.GetPeers()) > r.cluster.GetMaxReplicas() {
op, err := CreateRemovePeerOperator(removeExtra, r.cluster, OpReplica, region, peer.GetStoreId())
Expand All @@ -259,7 +259,7 @@ func (r *ReplicaChecker) fixPeer(region *core.RegionInfo, peer *metapb.Peer, sta
return op
}

removePending := fmt.Sprintf("removePending%sReplica", status)
removePending := fmt.Sprintf("remove-pending-%s-replica", status)
// Consider we have 3 peers (A, B, C), we set the store that contains C to
// offline/down while C is pending. If we generate an operator that adds a replica
// D then removes C, D will not be successfully added util C is normal again.
Expand All @@ -283,7 +283,7 @@ func (r *ReplicaChecker) fixPeer(region *core.RegionInfo, peer *metapb.Peer, sta
return nil
}

replace := fmt.Sprintf("replace%sReplica", status)
replace := fmt.Sprintf("replace-%s-replica", status)
op, err := CreateMovePeerOperator(replace, r.cluster, region, OpReplica, peer.GetStoreId(), newPeer.GetStoreId(), newPeer.GetId())
if err != nil {
return nil
Expand Down
8 changes: 4 additions & 4 deletions server/schedulers/hot_region.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,15 @@ func (h *balanceHotRegionsScheduler) balanceHotReadRegions(cluster schedule.Clus
if srcRegion != nil {
schedulerCounter.WithLabelValues(h.GetName(), "move_leader").Inc()
step := schedule.TransferLeader{FromStore: srcRegion.GetLeader().GetStoreId(), ToStore: newLeader.GetStoreId()}
op := schedule.NewOperator("transferHotReadLeader", srcRegion.GetID(), srcRegion.GetRegionEpoch(), schedule.OpHotRegion|schedule.OpLeader, step)
op := schedule.NewOperator("transfer-hot-read-leader", srcRegion.GetID(), srcRegion.GetRegionEpoch(), schedule.OpHotRegion|schedule.OpLeader, step)
op.SetPriorityLevel(core.HighPriority)
return []*schedule.Operator{op}
}

// balance by peer
srcRegion, srcPeer, destPeer := h.balanceByPeer(cluster, h.stats.readStatAsLeader)
if srcRegion != nil {
op, err := schedule.CreateMovePeerOperator("moveHotReadRegion", cluster, srcRegion, schedule.OpHotRegion, srcPeer.GetStoreId(), destPeer.GetStoreId(), destPeer.GetId())
op, err := schedule.CreateMovePeerOperator("move-hot-read-region", cluster, srcRegion, schedule.OpHotRegion, srcPeer.GetStoreId(), destPeer.GetStoreId(), destPeer.GetId())
if err != nil {
schedulerCounter.WithLabelValues(h.GetName(), "create_operator_fail").Inc()
return nil
Expand All @@ -197,7 +197,7 @@ func (h *balanceHotRegionsScheduler) balanceHotWriteRegions(cluster schedule.Clu
// balance by peer
srcRegion, srcPeer, destPeer := h.balanceByPeer(cluster, h.stats.writeStatAsPeer)
if srcRegion != nil {
op, err := schedule.CreateMovePeerOperator("moveHotWriteRegion", cluster, srcRegion, schedule.OpHotRegion, srcPeer.GetStoreId(), destPeer.GetStoreId(), destPeer.GetId())
op, err := schedule.CreateMovePeerOperator("move-hot-write-region", cluster, srcRegion, schedule.OpHotRegion, srcPeer.GetStoreId(), destPeer.GetStoreId(), destPeer.GetId())
if err != nil {
schedulerCounter.WithLabelValues(h.GetName(), "create_operator_fail").Inc()
return nil
Expand All @@ -212,7 +212,7 @@ func (h *balanceHotRegionsScheduler) balanceHotWriteRegions(cluster schedule.Clu
if srcRegion != nil {
schedulerCounter.WithLabelValues(h.GetName(), "move_leader").Inc()
step := schedule.TransferLeader{FromStore: srcRegion.GetLeader().GetStoreId(), ToStore: newLeader.GetStoreId()}
op := schedule.NewOperator("transferHotWriteLeader", srcRegion.GetID(), srcRegion.GetRegionEpoch(), schedule.OpHotRegion|schedule.OpLeader, step)
op := schedule.NewOperator("transfer-hot-write-leader", srcRegion.GetID(), srcRegion.GetRegionEpoch(), schedule.OpHotRegion|schedule.OpLeader, step)
op.SetPriorityLevel(core.HighPriority)
return []*schedule.Operator{op}
}
Expand Down
2 changes: 1 addition & 1 deletion server/schedulers/shuffle_hot_region.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func (s *shuffleHotRegionScheduler) randomSchedule(cluster schedule.Cluster, sto
schedule.TransferLeader{ToStore: destStoreID, FromStore: srcStoreID},
schedule.RemovePeer{FromStore: srcRegion.GetLeader().GetStoreId()},
}
return []*schedule.Operator{schedule.NewOperator("randomMoveHotRegion", srcRegion.GetID(), srcRegion.GetRegionEpoch(), schedule.OpRegion|schedule.OpLeader, st...)}
return []*schedule.Operator{schedule.NewOperator("random-move-hot-region", srcRegion.GetID(), srcRegion.GetRegionEpoch(), schedule.OpRegion|schedule.OpLeader, st...)}
}
schedulerCounter.WithLabelValues(s.GetName(), "skip").Inc()
return nil
Expand Down
2 changes: 1 addition & 1 deletion server/schedulers/shuffle_leader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (s *shuffleLeaderScheduler) Schedule(cluster schedule.Cluster) []*schedule.
}
schedulerCounter.WithLabelValues(s.GetName(), "new_operator").Inc()
step := schedule.TransferLeader{FromStore: region.GetLeader().GetStoreId(), ToStore: targetStore.GetID()}
op := schedule.NewOperator("shuffleLeader", region.GetID(), region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpLeader, step)
op := schedule.NewOperator("shuffle-leader", region.GetID(), region.GetRegionEpoch(), schedule.OpAdmin|schedule.OpLeader, step)
op.SetPriorityLevel(core.HighPriority)
return []*schedule.Operator{op}
}

0 comments on commit 9ba0e44

Please sign in to comment.