fix conflicts

Signed-off-by: nolouch <nolouch@gmail.com>
tikv · Jul 14, 2021 · a722bfb · a722bfb
1 parent 6b92c10
commit a722bfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/server/schedule/operator/kind.go b/server/schedule/operator/kind.go
@@ -24,18 +24,6 @@ type OpKind uint32
 
 // Flags for operators.
 const (
-<<<<<<< HEAD
-	OpLeader    OpKind = 1 << iota // Include leader transfer.
-	OpRegion                       // Include peer movement.
-	OpSplit                        // Include region split.
-	OpAdmin                        // Initiated by admin.
-	OpHotRegion                    // Initiated by hot region scheduler.
-	OpAdjacent                     // Initiated by adjacent region scheduler.
-	OpReplica                      // Initiated by replica checkers.
-	OpBalance                      // Initiated by balancers.
-	OpMerge                        // Initiated by merge checkers or merge schedulers.
-	OpRange                        // Initiated by range scheduler.
-=======
 	// Initiated by merge checker or merge scheduler. Note that it may not include region merge.
 	// the order describe the operator's producer and is very helpful to decouple scheduler or checker limit
 	OpMerge OpKind = 1 << iota
@@ -51,9 +39,10 @@ const (
 	OpRegion
 	// Include leader transfer.
 	OpLeader
+	OpBalance
+	OpAdjacent
 	// Initiated by admin.
 	OpAdmin
->>>>>>> e05892721 (schedule:  one operator only occupy one limit (#3820))
 	opMax
 )
 

diff --git a/server/schedulers/balance_region.go b/server/schedulers/balance_region.go
@@ -127,11 +127,7 @@ func (s *balanceRegionScheduler) EncodeConfig() ([]byte, error) {
 }
 
 func (s *balanceRegionScheduler) IsScheduleAllowed(cluster opt.Cluster) bool {
-<<<<<<< HEAD
-	allowed := s.opController.OperatorCount(operator.OpRegion)-s.opController.OperatorCount(operator.OpMerge) < cluster.GetRegionScheduleLimit()
-=======
-	allowed := s.opController.OperatorCount(operator.OpRegion) < cluster.GetOpts().GetRegionScheduleLimit()
->>>>>>> e05892721 (schedule:  one operator only occupy one limit (#3820))
+	allowed := s.opController.OperatorCount(operator.OpRegion) < cluster.GetRegionScheduleLimit()
 	if !allowed {
 		operator.OperatorLimitCounter.WithLabelValues(s.GetType(), operator.OpRegion.String()).Inc()
 	}