Fix bug

Signed-off-by: ZenoTan <[email protected]>
nolouch · Oct 10, 2020 · 5cbe9d1 · 5cbe9d1
1 parent 2240504
commit 5cbe9d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/server/schedule/checker/learner_checker.go b/server/schedule/checker/learner_checker.go
@@ -36,15 +36,14 @@ func NewLearnerChecker(cluster opt.Cluster) *LearnerChecker {
 // Check verifies a region's role, creating an Operator if need.
 func (l *LearnerChecker) Check(region *core.RegionInfo) *operator.Operator {
 	for _, p := range region.GetLearners() {
-		if region.GetPendingLearner(p.GetId()) != nil {
-			continue
-		}
 		op, err := operator.CreatePromoteLearnerOperator("promote-learner", l.cluster, region, p)
 		if err != nil {
 			log.Debug("fail to create promote learner operator", errs.ZapError(err))
 			return nil
 		}
-		return op
+		if op != nil {
+			return op
+		}
 	}
 	return nil
 }
diff --git a/server/schedule/operator/create_operator.go b/server/schedule/operator/create_operator.go
@@ -34,6 +34,9 @@ func CreateAddPeerOperator(desc string, cluster opt.Cluster, region *core.Region
 
 // CreatePromoteLearnerOperator creates an operator that promotes a learner.
 func CreatePromoteLearnerOperator(desc string, cluster opt.Cluster, region *core.RegionInfo, peer *metapb.Peer) (*Operator, error) {
+	if region.GetPendingPeer(peer.GetId()) != nil {
+		return nil, nil
+	}
 	return NewBuilder(desc, cluster, region).
 		PromoteLearner(peer.GetStoreId()).
 		Build(0)