statistic: fix the issue of tombstone for label counter (#2060) (#2067)

* statistic: fix the issue of tombstone for label counter Signed-off-by: nolouch <nolouch@gmail.com>
tikv · Dec 31, 2019 · 330c108 · 330c108
1 parent 456c42b
commit 330c108
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/server/statistics/store_collection.go b/server/statistics/store_collection.go
@@ -92,7 +92,10 @@ func (s *storeStatistics) Observe(store *core.StoreInfo, stats *StoresStats) {
 			v = unknown
 		}
 		key := fmt.Sprintf("%s:%s", k, v)
-		s.LabelCounter[key]++
+		// exclude tombstone
+		if store.GetState() != metapb.StoreState_Tombstone {
+			s.LabelCounter[key]++
+		}
 	}
 	storeAddress := store.GetAddress()
 	id := strconv.FormatUint(store.GetID(), 10)
@@ -268,4 +271,5 @@ func (m *storeStatisticsMap) Collect() {
 func (m *storeStatisticsMap) Reset() {
 	storeStatusGauge.Reset()
 	clusterStatusGauge.Reset()
+	placementStatusGauge.Reset()
 }
diff --git a/server/statistics/store_collection_test.go b/server/statistics/store_collection_test.go
@@ -40,6 +40,7 @@ func (t *testStoreStatisticsSuite) TestStoreStatistics(c *C) {
 		{Id: 6, Address: "mock://tikv-6", Labels: []*metapb.StoreLabel{{Key: "zone", Value: "z3"}, {Key: "host", Value: "h2"}}},
 		{Id: 7, Address: "mock://tikv-7", Labels: []*metapb.StoreLabel{{Key: "host", Value: "h1"}}},
 		{Id: 8, Address: "mock://tikv-8", Labels: []*metapb.StoreLabel{{Key: "host", Value: "h2"}}},
+		{Id: 8, Address: "mock://tikv-9", Labels: []*metapb.StoreLabel{{Key: "host", Value: "h3"}}, State: metapb.StoreState_Tombstone},
 	}
 	storesStats := NewStoresStats()
 	var stores []*core.StoreInfo
@@ -65,7 +66,7 @@ func (t *testStoreStatisticsSuite) TestStoreStatistics(c *C) {
 	c.Assert(stats.RegionCount, Equals, 0)
 	c.Assert(stats.Unhealth, Equals, 0)
 	c.Assert(stats.Disconnect, Equals, 0)
-	c.Assert(stats.Tombstone, Equals, 0)
+	c.Assert(stats.Tombstone, Equals, 1)
 	c.Assert(stats.LowSpace, Equals, 8)
 	c.Assert(stats.LabelCounter["zone:z1"], Equals, 2)
 	c.Assert(stats.LabelCounter["zone:z2"], Equals, 2)