clean up handling metrics process

Signed-off-by: Ryan Leung <[email protected]>
tikv · Nov 15, 2023 · eee7c2b · eee7c2b
1 parent 52858a1
commit eee7c2b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 41 deletions.
diff --git a/pkg/mcs/scheduling/server/cluster.go b/pkg/mcs/scheduling/server/cluster.go
@@ -486,10 +486,6 @@ func (c *Cluster) collectMetrics() {
 
 	c.coordinator.GetSchedulersController().CollectSchedulerMetrics()
 	c.coordinator.CollectHotSpotMetrics()
-	c.collectClusterMetrics()
-}
-
-func (c *Cluster) collectClusterMetrics() {
 	if c.regionStats == nil {
 		return
 	}
@@ -501,20 +497,8 @@ func (c *Cluster) collectClusterMetrics() {
 
 func (c *Cluster) resetMetrics() {
 	statistics.Reset()
-
 	schedulers.ResetSchedulerMetrics()
 	schedule.ResetHotSpotMetrics()
-	c.resetClusterMetrics()
-}
-
-func (c *Cluster) resetClusterMetrics() {
-	if c.regionStats == nil {
-		return
-	}
-	c.regionStats.Reset()
-	c.labelStats.Reset()
-	// reset hot cache metrics
-	c.hotStat.ResetMetrics()
 }
 
 // StartBackgroundJobs starts background jobs.

diff --git a/pkg/statistics/hot_cache.go b/pkg/statistics/hot_cache.go
@@ -125,8 +125,8 @@ func (w *HotCache) CollectMetrics() {
 	w.CheckReadAsync(newCollectMetricsTask())
 }
 
-// ResetMetrics resets the hot cache metrics.
-func (w *HotCache) ResetMetrics() {
+// ResetHotCacheStatusMetrics resets the hot cache metrics.
+func ResetHotCacheStatusMetrics() {
 	hotCacheStatusGauge.Reset()
 }
 

diff --git a/pkg/statistics/region_collection.go b/pkg/statistics/region_collection.go
@@ -272,8 +272,8 @@ func (r *RegionStatistics) Collect() {
 	regionWitnessLeaderRegionCounter.Set(float64(len(r.stats[WitnessLeader])))
 }
 
-// Reset resets the metrics of the regions' status.
-func (r *RegionStatistics) Reset() {
+// ResetRegionStatsMetrics resets the metrics of the regions' status.
+func ResetRegionStatsMetrics() {
 	regionMissPeerRegionCounter.Set(0)
 	regionExtraPeerRegionCounter.Set(0)
 	regionDownPeerRegionCounter.Set(0)
@@ -326,8 +326,8 @@ func (l *LabelStatistics) Collect() {
 	}
 }
 
-// Reset resets the metrics of the label status.
-func (l *LabelStatistics) Reset() {
+// ResetLabelStatsMetrics resets the metrics of the label status.
+func ResetLabelStatsMetrics() {
 	regionLabelLevelGauge.Reset()
 }
 

diff --git a/pkg/statistics/store_collection.go b/pkg/statistics/store_collection.go
@@ -322,4 +322,7 @@ func Reset() {
 	storeStatusGauge.Reset()
 	clusterStatusGauge.Reset()
 	placementStatusGauge.Reset()
+	ResetRegionStatsMetrics()
+	ResetLabelStatsMetrics()
+	ResetHotCacheStatusMetrics()
 }
diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go
@@ -2500,14 +2500,17 @@ func TestCollectMetricsConcurrent(t *testing.T) {
 		}(i)
 	}
 	controller := co.GetSchedulersController()
+	rc := co.GetCluster().(*RaftCluster)
+	rc.SchedulingController = NewSchedulingController(rc.serverCtx, rc.GetBasicCluster(), rc.GetOpts(), rc.GetRuleManager())
+	rc.SchedulingController.coordinator = co
 	for i := 0; i < 1000; i++ {
 		co.CollectHotSpotMetrics()
 		controller.CollectSchedulerMetrics()
-		co.GetCluster().(*RaftCluster).collectStatisticsMetrics()
+		rc.collectSchedulingMetrics()
 	}
 	schedule.ResetHotSpotMetrics()
 	schedulers.ResetSchedulerMetrics()
-	co.GetCluster().(*RaftCluster).resetStatisticsMetrics()
+	rc.resetSchedulingMetrics()
 	wg.Wait()
 }
 
@@ -2535,10 +2538,13 @@ func TestCollectMetrics(t *testing.T) {
 		}
 	}
 	controller := co.GetSchedulersController()
+	rc := co.GetCluster().(*RaftCluster)
+	rc.SchedulingController = NewSchedulingController(rc.serverCtx, rc.GetBasicCluster(), rc.GetOpts(), rc.GetRuleManager())
+	rc.SchedulingController.coordinator = co
 	for i := 0; i < 1000; i++ {
 		co.CollectHotSpotMetrics()
 		controller.CollectSchedulerMetrics()
-		co.GetCluster().(*RaftCluster).collectStatisticsMetrics()
+		rc.collectSchedulingMetrics()
 	}
 	stores := co.GetCluster().GetStores()
 	regionStats := co.GetCluster().RegionWriteStats()
@@ -2553,7 +2559,7 @@ func TestCollectMetrics(t *testing.T) {
 	re.Equal(status1, status2)
 	schedule.ResetHotSpotMetrics()
 	schedulers.ResetSchedulerMetrics()
-	co.GetCluster().(*RaftCluster).resetStatisticsMetrics()
+	rc.resetSchedulingMetrics()
 }
 
 func prepare(setCfg func(*sc.ScheduleConfig), setTc func(*testCluster), run func(*schedule.Coordinator), re *require.Assertions) (*testCluster, *schedule.Coordinator, func()) {

diff --git a/server/cluster/scheduling_controller.go b/server/cluster/scheduling_controller.go
@@ -168,7 +168,10 @@ func (sc *SchedulingController) resetSchedulingMetrics() {
 	statistics.Reset()
 	schedulers.ResetSchedulerMetrics()
 	schedule.ResetHotSpotMetrics()
-	sc.resetStatisticsMetrics()
+	statistics.ResetRegionStatsMetrics()
+	statistics.ResetLabelStatsMetrics()
+	// reset hot cache metrics
+	statistics.ResetHotCacheStatusMetrics()
 }
 
 func (sc *SchedulingController) collectSchedulingMetrics() {
@@ -181,20 +184,6 @@ func (sc *SchedulingController) collectSchedulingMetrics() {
 	statsMap.Collect()
 	sc.coordinator.GetSchedulersController().CollectSchedulerMetrics()
 	sc.coordinator.CollectHotSpotMetrics()
-	sc.collectStatisticsMetrics()
-}
-
-func (sc *SchedulingController) resetStatisticsMetrics() {
-	if sc.regionStats == nil {
-		return
-	}
-	sc.regionStats.Reset()
-	sc.labelStats.Reset()
-	// reset hot cache metrics
-	sc.hotStat.ResetMetrics()
-}
-
-func (sc *SchedulingController) collectStatisticsMetrics() {
 	if sc.regionStats == nil {
 		return
 	}