statle test

Signed-off-by: Connor1996 <zbk602423539@gmail.com>
tikv · Nov 30, 2018 · 2ea0175 · 2ea0175
1 parent 310fab8
commit 2ea0175
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/server/schedulers/balance_test.go b/server/schedulers/balance_test.go
@@ -880,7 +880,7 @@ func (s *testMergeCheckerSuite) SetUpTest(c *C) {
 				StartKey: []byte("t"),
 				EndKey:   []byte("x"),
 				Peers: []*metapb.Peer{
-					{Id: 106, StoreId: 1},
+					{Id: 106, StoreId: 2},
 					{Id: 107, StoreId: 5},
 					{Id: 108, StoreId: 6},
 				},
@@ -944,8 +944,11 @@ func (s *testMergeCheckerSuite) TestMatchPeers(c *C) {
 	ops := s.mc.Check(s.regions[2])
 	s.checkSteps(c, ops[0], []schedule.OperatorStep{
 		schedule.TransferLeader{FromStore: 6, ToStore: 5},
-		schedule.AddLearner{ToStore: 4, PeerID: 1},
-		schedule.PromoteLearner{ToStore: 4, PeerID: 1},
+		schedule.AddLearner{ToStore: 1, PeerID: 1},
+		schedule.PromoteLearner{ToStore: 1, PeerID: 1},
+		schedule.RemovePeer{FromStore: 2},
+		schedule.AddLearner{ToStore: 4, PeerID: 2},
+		schedule.PromoteLearner{ToStore: 4, PeerID: 2},
 		schedule.RemovePeer{FromStore: 6},
 		schedule.MergeRegion{
 			FromRegion: s.regions[2].GetMeta(),
@@ -962,13 +965,20 @@ func (s *testMergeCheckerSuite) TestMatchPeers(c *C) {
 	})
 
 	// partial store overlap including leader
-	newRegion := s.regions[2].Clone(core.WithLeader(&metapb.Peer{Id: 106, StoreId: 1}))
+	newRegion := s.regions[2].Clone(
+		core.SetPeers([]*metapb.Peer{
+			{Id: 106, StoreId: 1},
+			{Id: 107, StoreId: 5},
+			{Id: 108, StoreId: 6},
+		}),
+		core.WithLeader(&metapb.Peer{Id: 106, StoreId: 1}),
+	)
 	s.regions[2] = newRegion
 	s.cluster.PutRegion(s.regions[2])
 	ops = s.mc.Check(s.regions[2])
 	s.checkSteps(c, ops[0], []schedule.OperatorStep{
-		schedule.AddLearner{ToStore: 4, PeerID: 2},
-		schedule.PromoteLearner{ToStore: 4, PeerID: 2},
+		schedule.AddLearner{ToStore: 4, PeerID: 3},
+		schedule.PromoteLearner{ToStore: 4, PeerID: 3},
 		schedule.RemovePeer{FromStore: 6},
 		schedule.MergeRegion{
 			FromRegion: s.regions[2].GetMeta(),
@@ -1016,14 +1026,14 @@ func (s *testMergeCheckerSuite) TestMatchPeers(c *C) {
 	s.cluster.PutRegion(s.regions[2])
 	ops = s.mc.Check(s.regions[2])
 	s.checkSteps(c, ops[0], []schedule.OperatorStep{
-		schedule.AddLearner{ToStore: 1, PeerID: 3},
-		schedule.PromoteLearner{ToStore: 1, PeerID: 3},
+		schedule.AddLearner{ToStore: 1, PeerID: 4},
+		schedule.PromoteLearner{ToStore: 1, PeerID: 4},
 		schedule.RemovePeer{FromStore: 3},
-		schedule.AddLearner{ToStore: 4, PeerID: 4},
-		schedule.PromoteLearner{ToStore: 4, PeerID: 4},
+		schedule.AddLearner{ToStore: 4, PeerID: 5},
+		schedule.PromoteLearner{ToStore: 4, PeerID: 5},
 		schedule.RemovePeer{FromStore: 6},
-		schedule.AddLearner{ToStore: 5, PeerID: 5},
-		schedule.PromoteLearner{ToStore: 5, PeerID: 5},
+		schedule.AddLearner{ToStore: 5, PeerID: 6},
+		schedule.PromoteLearner{ToStore: 5, PeerID: 6},
 		schedule.TransferLeader{FromStore: 2, ToStore: 1},
 		schedule.RemovePeer{FromStore: 2},
 		schedule.MergeRegion{