region_cache: filter out unresolved stores when GetTiFlashStores

Signed-off-by: zyguan <[email protected]>
tikv · Apr 3, 2024 · 94106ea · 94106ea
1 parent 5a4905d
commit 94106ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/locate/region_cache.go b/internal/locate/region_cache.go
@@ -2194,7 +2194,7 @@ func (c *RegionCache) PDClient() pd.Client {
 // GetTiFlashStores returns the information of all tiflash nodes.
 func (c *RegionCache) GetTiFlashStores(labelFilter LabelFilter) []*Store {
 	return c.filterStores(nil, func(s *Store) bool {
-		return s.storeType == tikvrpc.TiFlash && labelFilter(s.labels)
+		return s.storeType == tikvrpc.TiFlash && labelFilter(s.labels) && s.getResolveState() == resolved
 	})
 }
 

diff --git a/internal/locate/store_cache.go b/internal/locate/store_cache.go
@@ -411,7 +411,7 @@ func (s *Store) reResolve(c storeCache) (bool, error) {
 	if store == nil || store.GetState() == metapb.StoreState_Tombstone {
 		// store has be removed in PD, we should invalidate all regions using those store.
 		logutil.BgLogger().Info("invalidate regions in removed store",
-			zap.Uint64("store", s.storeID), zap.String("add", s.addr))
+			zap.Uint64("store", s.storeID), zap.String("addr", s.addr))
 		atomic.AddUint32(&s.epoch, 1)
 		s.setResolveState(tombstone)
 		metrics.RegionCacheCounterWithInvalidateStoreRegionsOK.Inc()