server: fix the issue that panic when collecting hot-cache metrics

tikv · May 25, 2018 · 28243b5 · 28243b5
1 parent 534bdcf
commit 28243b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/cache.go b/server/cache.go
@@ -507,6 +507,8 @@ func (c *clusterInfo) collectMetrics() {
 	defer c.RUnlock()
 	c.regionStats.Collect()
 	c.labelLevelStats.Collect()
+	// collect hot cache metrics
+	c.HotCache.CollectMetrics(c.Stores)
 }
 
 func (c *clusterInfo) GetRegionStatsByType(typ regionStatisticType) []*core.RegionInfo {

diff --git a/server/coordinator.go b/server/coordinator.go
@@ -365,8 +365,6 @@ func (c *coordinator) collectHotSpotMetrics() {
 		}
 	}
 
-	// collect hot cache metrics
-	c.cluster.HotCache.CollectMetrics(c.cluster.Stores)
 }
 
 func (c *coordinator) shouldRun() bool {
-Original file line number
+Diff line change
@@ Expand Up / @@ -365,8 +365,6 @@ func (c *coordinator) collectHotSpotMetrics() { @@
     		}
     	}
-    	// collect hot cache metrics
-    	c.cluster.HotCache.CollectMetrics(c.cluster.Stores)
     }
     func (c *coordinator) shouldRun() bool {
@@ Expand Down @@