adjuest step cost

ref #5762 Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
tikv · Dec 27, 2022 · a2258e8 · a2258e8
1 parent f819315
commit a2258e8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/server/schedule/operator/step.go b/server/schedule/operator/step.go
@@ -185,7 +185,7 @@ func (ap AddPeer) Influence(opInfluence OpInfluence, region *core.RegionInfo) {
 		to.RegionSize += regionSize
 	}
 	to.RegionCount++
-	if ap.IsLightWeight {
+	if ap.IsLightWeight || ap.IsWitness {
 		return
 	}
 	to.AdjustStepCost(storelimit.AddPeer, regionSize)
@@ -264,7 +264,6 @@ func (bw BecomeWitness) Influence(opInfluence OpInfluence, region *core.RegionIn
 	regionSize := region.GetApproximateSize()
 	to.WitnessCount += 1
 	to.RegionSize -= regionSize
-	to.AdjustStepCost(storelimit.RemovePeer, regionSize)
 }
 
 // Timeout returns duration that current step may take.
@@ -496,7 +495,7 @@ func (al AddLearner) Influence(opInfluence OpInfluence, region *core.RegionInfo)
 		to.RegionSize += regionSize
 	}
 	to.RegionCount++
-	if al.IsLightWeight {
+	if al.IsLightWeight || al.IsWitness {
 		return
 	}
 	to.AdjustStepCost(storelimit.AddPeer, regionSize)
@@ -614,6 +613,7 @@ func (rp RemovePeer) Influence(opInfluence OpInfluence, region *core.RegionInfo)
 	peer := region.GetStorePeer(rp.FromStore)
 	if peer != nil && peer.IsWitness {
 		from.WitnessCount--
+		return
 	}
 
 	if rp.IsDownStore && regionSize > storelimit.SmallRegionThreshold {