fix data race by replace clone (tikv#6242)

close tikv#6230 Signed-off-by: bufferflies <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]>
bufferflies · Apr 21, 2023 · 8d8172e · 8d8172e
1 parent 5f99e0c
commit 8d8172e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/pkg/core/storelimit/limit_test.go b/pkg/core/storelimit/limit_test.go
@@ -24,7 +24,8 @@ import (
 func TestStoreLimit(t *testing.T) {
 	re := require.New(t)
 	rate := int64(15)
-	limit := NewStoreRateLimit(float64(rate))
+	limit := NewStoreRateLimit(float64(rate)).(*StoreRateLimit)
+	re.Equal(limit.Rate(AddPeer), float64(15))
 	re.True(limit.Available(influence*rate, AddPeer, constant.Low))
 	re.True(limit.Take(influence*rate, AddPeer, constant.Low))
 	re.False(limit.Take(influence, AddPeer, constant.Low))

diff --git a/pkg/core/storelimit/store_limit.go b/pkg/core/storelimit/store_limit.go
@@ -93,6 +93,14 @@ func (l *StoreRateLimit) Available(cost int64, typ Type, _ constant.PriorityLeve
 	return l.limits[typ].Available(cost)
 }
 
+// Rate returns the capacity of the store limit.
+func (l *StoreRateLimit) Rate(typ Type) float64 {
+	if l.limits[typ] == nil {
+		return 0.0
+	}
+	return l.limits[typ].ratePerSec
+}
+
 // Take takes count tokens from the bucket without blocking.
 // notice that the priority level is not used.
 func (l *StoreRateLimit) Take(cost int64, typ Type, _ constant.PriorityLevel) bool {

diff --git a/pkg/schedule/operator_controller.go b/pkg/schedule/operator_controller.go
@@ -878,8 +878,9 @@ func (oc *OperatorController) getOrCreateStoreLimit(storeID uint64, limitType st
 		log.Error("invalid store ID", zap.Uint64("store-id", storeID))
 		return nil
 	}
-
-	limit := s.GetStoreLimit()
-	limit.Reset(ratePerSec, limitType)
-	return limit
+	// The other limits do not need to update by config exclude StoreRateLimit.
+	if limit, ok := s.GetStoreLimit().(*storelimit.StoreRateLimit); ok && limit.Rate(limitType) != ratePerSec {
+		oc.cluster.GetBasicCluster().ResetStoreLimit(storeID, limitType, ratePerSec)
+	}
+	return s.GetStoreLimit()
 }