remove IsAttached function

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Jun 19, 2019 · f10e108 · f10e108
1 parent e559eff
commit f10e108
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/server/coordinator_test.go b/server/coordinator_test.go
@@ -783,9 +783,6 @@ func (s *testOperatorControllerSuite) TestStoreOverloaded(c *C) {
 	op1 := lb.Schedule(tc)[0]
 	c.Assert(op1, NotNil)
 	c.Assert(oc.AddOperator(op1), IsTrue)
-	op2 := lb.Schedule(tc)[0]
-	c.Assert(op2, NotNil)
-	c.Assert(oc.AddOperator(op2), IsFalse)
 	for i := 0; i < 10; i++ {
 		c.Assert(lb.Schedule(tc), IsNil)
 	}

diff --git a/server/core/store.go b/server/core/store.go
@@ -93,11 +93,6 @@ func (s *StoreInfo) IsOverloaded() bool {
 	return s.overloaded()
 }
 
-// IsAttached returns if the store is attached with the overloaded status.
-func (s *StoreInfo) IsAttached() bool {
-	return s.overloaded != nil
-}
-
 // IsUp checks if the store's state is Up.
 func (s *StoreInfo) IsUp() bool {
 	return s.GetState() == metapb.StoreState_Up

diff --git a/server/schedule/operator_controller.go b/server/schedule/operator_controller.go
@@ -617,24 +617,25 @@ func (o *OperatorRecords) Put(op *Operator, status pdpb.OperatorStatus) {
 func (oc *OperatorController) exceedStoreLimit(ops ...*Operator) bool {
 	opInfluence := NewTotalOpInfluence(ops, oc.cluster)
 	for storeID := range opInfluence.storesInfluence {
-		if oc.storesLimit[storeID] == nil {
-			rate := oc.cluster.GetStoreBalanceRate()
-			oc.newStoreLimit(storeID, rate)
-		}
-		stepCost := opInfluence.GetStoreInfluence(storeID).StepCost
+		id := storeID
+		stepCost := opInfluence.GetStoreInfluence(id).StepCost
 		if stepCost == 0 {
 			continue
 		}
-		available := oc.storesLimit[storeID].Available()
-		storeLimit.WithLabelValues(strconv.FormatUint(storeID, 10), "available").Set(float64(available) / float64(RegionInfluence))
+
+		if oc.storesLimit[id] == nil {
+			rate := oc.cluster.GetStoreBalanceRate()
+			oc.newStoreLimit(id, rate)
+			oc.cluster.AttachOverloadStatus(id, func() bool {
+				oc.RLock()
+				defer oc.RUnlock()
+				return oc.storesLimit[id].Available() < RegionInfluence
+			})
+		}
+
+		available := oc.storesLimit[id].Available()
+		storeLimit.WithLabelValues(strconv.FormatUint(id, 10), "available").Set(float64(available) / float64(RegionInfluence))
 		if available < stepCost {
-			if !oc.cluster.GetStore(storeID).IsAttached() {
-				oc.cluster.AttachOverloadStatus(storeID, func() bool {
-					oc.RLock()
-					defer oc.RUnlock()
-					return oc.storesLimit[storeID].Available() < RegionInfluence
-				})
-			}
 			return true
 		}
 	}