*: remove store statistics after store tombstone (tikv#7186)

close tikv#7187 Signed-off-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
lhy1024 · Oct 12, 2023 · e6e7c64 · e6e7c64
1 parent c3d2ee7
commit e6e7c64
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/pkg/mcs/scheduling/server/cluster.go b/pkg/mcs/scheduling/server/cluster.go
@@ -476,8 +476,7 @@ func (c *Cluster) collectClusterMetrics() {
 }
 
 func (c *Cluster) resetMetrics() {
-	statsMap := statistics.NewStoreStatisticsMap(c.persistConfig)
-	statsMap.Reset()
+	statistics.Reset()
 
 	c.coordinator.GetSchedulersController().ResetSchedulerMetrics()
 	c.coordinator.ResetHotSpotMetrics()

diff --git a/pkg/statistics/store_collection.go b/pkg/statistics/store_collection.go
@@ -102,7 +102,6 @@ func (s *storeStatistics) Observe(store *core.StoreInfo) {
 	case metapb.NodeState_Removed:
 		s.Tombstone++
 		s.Removed++
-		s.resetStoreStatistics(storeAddress, id)
 		return
 	}
 
@@ -261,7 +260,8 @@ func (s *storeStatistics) Collect() {
 	}
 }
 
-func (s *storeStatistics) resetStoreStatistics(storeAddress string, id string) {
+// ResetStoreStatistics resets the metrics of store.
+func ResetStoreStatistics(storeAddress string, id string) {
 	metrics := []string{
 		"region_score",
 		"leader_score",
@@ -317,7 +317,8 @@ func (m *storeStatisticsMap) Collect() {
 	m.stats.Collect()
 }
 
-func (m *storeStatisticsMap) Reset() {
+// Reset resets the metrics.
+func Reset() {
 	storeStatusGauge.Reset()
 	clusterStatusGauge.Reset()
 	placementStatusGauge.Reset()

diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -1625,7 +1625,10 @@ func (c *RaftCluster) BuryStore(storeID uint64, forceBury bool) error {
 		// clean up the residual information.
 		delete(c.prevStoreLimit, storeID)
 		c.RemoveStoreLimit(storeID)
-		c.resetProgress(storeID, store.GetAddress())
+		addr := store.GetAddress()
+		c.resetProgress(storeID, addr)
+		storeIDStr := strconv.FormatUint(storeID, 10)
+		statistics.ResetStoreStatistics(addr, storeIDStr)
 		if !c.isAPIServiceMode {
 			c.hotStat.RemoveRollingStoreStats(storeID)
 			c.slowStat.RemoveSlowStoreStatus(storeID)
@@ -2169,8 +2172,7 @@ func (c *RaftCluster) collectMetrics() {
 }
 
 func (c *RaftCluster) resetMetrics() {
-	statsMap := statistics.NewStoreStatisticsMap(c.opt)
-	statsMap.Reset()
+	statistics.Reset()
 
 	if !c.isAPIServiceMode {
 		c.coordinator.GetSchedulersController().ResetSchedulerMetrics()