use atomic.Value

Signed-off-by: lhy1024 <[email protected]>

pkg/schedule/checker/checker_controller.go

@@ -19,6 +19,7 @@ import (
 	"context"
 	"strconv"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/pingcap/failpoint"
@@ -33,7 +34,6 @@ import (
 	"github.com/tikv/pd/pkg/schedule/placement"
 	"github.com/tikv/pd/pkg/utils/keyutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
-	"github.com/tikv/pd/pkg/utils/typeutil"
 	"go.uber.org/zap"
 )
 
@@ -78,7 +78,7 @@ type Controller struct {
 
 	// duration is the duration of the last patrol round.
 	// It's exported, so it should be protected by a mutex.
-	duration typeutil.LockedValue[time.Duration]
+	duration atomic.Value // Store as time.Duration
 
 	// interval is the config interval of patrol regions.
 	// It's used to update the ticker, so we need to
@@ -208,11 +208,11 @@ func (c *Controller) updatePatrolWorkersIfNeeded() {
 
 // GetPatrolRegionsDuration returns the duration of the last patrol region round.
 func (c *Controller) GetPatrolRegionsDuration() time.Duration {
-	return c.duration.Get()
+	return c.duration.Load().(time.Duration)
 }
 
 func (c *Controller) setPatrolRegionsDuration(dur time.Duration) {
-	c.duration.Set(dur)
+	c.duration.Store(dur)
 }
 
 func (c *Controller) checkRegions(startKey []byte) (key []byte, regions []*core.RegionInfo) {

server/cluster/cluster.go

@@ -26,6 +26,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/coreos/go-semver/semver"
@@ -157,8 +158,8 @@ type RaftCluster struct {
 	isAPIServiceMode bool
 	meta             *metapb.Cluster
 	storage          storage.Storage
-	minResolvedTS    typeutil.LockedValue[uint64]
-	externalTS       typeutil.LockedValue[uint64]
+	minResolvedTS    atomic.Value // Store as uint64
+	externalTS       atomic.Value // Store as uint64
 
 	// Keep the previous store limit settings when removing a store.
 	prevStoreLimit map[uint64]map[storelimit.Type]float64
@@ -358,7 +359,7 @@ func (c *RaftCluster) Start(s Server) error {
 	if err != nil {
 		log.Error("load external timestamp meets error", zap.Error(err))
 	}
-	c.externalTS.Set(externalTS)
+	c.externalTS.Store(externalTS)
 
 	if c.isAPIServiceMode {
 		// bootstrap keyspace group manager after starting other parts successfully.
@@ -2269,11 +2270,11 @@ func (c *RaftCluster) CheckAndUpdateMinResolvedTS() (uint64, bool) {
 			newMinResolvedTS = s.GetMinResolvedTS()
 		}
 	}
-	oldMinResolvedTS := c.minResolvedTS.Get()
+	oldMinResolvedTS := c.minResolvedTS.Load().(uint64)
 	if newMinResolvedTS == math.MaxUint64 || newMinResolvedTS <= oldMinResolvedTS {
 		return oldMinResolvedTS, false
 	}
-	c.minResolvedTS.Set(newMinResolvedTS)
+	c.minResolvedTS.Store(newMinResolvedTS)
 	return newMinResolvedTS, true
 }
 
@@ -2318,15 +2319,15 @@ func (c *RaftCluster) loadMinResolvedTS() {
 		log.Error("load min resolved ts meet error", errs.ZapError(err))
 		return
 	}
-	c.minResolvedTS.Set(minResolvedTS)
+	c.minResolvedTS.Store(minResolvedTS)
 }
 
 // GetMinResolvedTS returns the min resolved ts of the cluster.
 func (c *RaftCluster) GetMinResolvedTS() uint64 {
 	if !c.isInitialized() {
 		return math.MaxUint64
 	}
-	return c.minResolvedTS.Get()
+	return c.minResolvedTS.Load().(uint64)
 }
 
 // GetStoreMinResolvedTS returns the min resolved ts of the store.
@@ -2361,12 +2362,12 @@ func (c *RaftCluster) GetExternalTS() uint64 {
 	if !c.isInitialized() {
 		return math.MaxUint64
 	}
-	return c.externalTS.Get()
+	return c.externalTS.Load().(uint64)
 }
 
 // SetExternalTS sets the external timestamp.
 func (c *RaftCluster) SetExternalTS(timestamp uint64) error {
-	c.externalTS.Set(timestamp)
+	c.externalTS.Store(timestamp)
 	return c.storage.SaveExternalTS(timestamp)
 }