fix CI.

tikv · Mar 23, 2017 · 270dae7 · 270dae7
1 parent 9207755
commit 270dae7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/server/region.go b/server/region.go
@@ -119,6 +119,15 @@ func (r *regionInfo) GetFollowers() map[uint64]*metapb.Peer {
 	return followers
 }
 
+func (r *regionInfo) GetFollower() *metapb.Peer {
+	for _, peer := range r.GetPeers() {
+		if r.Leader == nil || r.Leader.GetId() != peer.GetId() {
+			return peer
+		}
+	}
+	return nil
+}
+
 var _ btree.Item = &regionItem{}
 
 type regionItem struct {

diff --git a/server/scheduler.go b/server/scheduler.go
@@ -244,8 +244,8 @@ func newAddPeer(region *regionInfo, peer *metapb.Peer) Operator {
 func newRemovePeer(region *regionInfo, peer *metapb.Peer) Operator {
 	removePeer := newRemovePeerOperator(region.GetId(), peer)
 	if region.Leader != nil && region.Leader.GetId() == peer.GetId() {
-		if followers := region.GetFollowers(); len(followers) > 0 {
-			transferLeader := newTransferLeaderOperator(region.GetId(), region.Leader, followers[0])
+		if follower := region.GetFollower(); follower != nil {
+			transferLeader := newTransferLeaderOperator(region.GetId(), region.Leader, follower)
 			return newRegionOperator(region, regionKind, transferLeader, removePeer)
 		}
 		return nil
@@ -258,8 +258,8 @@ func newTransferPeer(region *regionInfo, oldPeer, newPeer *metapb.Peer) Operator
 	removePeer := newRemovePeerOperator(region.GetId(), oldPeer)
 	if region.Leader != nil && region.Leader.GetId() == oldPeer.GetId() {
 		newLeader := newPeer
-		if followers := region.GetFollowers(); len(followers) > 0 {
-			newLeader = followers[0]
+		if follower := region.GetFollower(); follower != nil {
+			newLeader = follower
 		}
 		transferLeader := newTransferLeaderOperator(region.GetId(), region.Leader, newLeader)
 		return newRegionOperator(region, regionKind, addPeer, transferLeader, removePeer)