cherry pick pingcap#24726 to release-4.0

Signed-off-by: ti-srebot <[email protected]>
ti-srebot · Jun 30, 2021 · 61dc403 · 61dc403
1 parent 57fa70a
commit 61dc403
Show file tree

Hide file tree

Showing 3 changed files with 359 additions and 49 deletions.
diff --git a/store/mockstore/mocktikv/pd.go b/store/mockstore/mocktikv/pd.go
@@ -119,6 +119,10 @@ func (c *pdClient) GetStore(ctx context.Context, storeID uint64) (*metapb.Store,
 	default:
 	}
 	store := c.cluster.GetStore(storeID)
+<<<<<<< HEAD:store/mockstore/mocktikv/pd.go
+=======
+	// It's same as PD's implementation.
+>>>>>>> 55d26c583... region_cache: filter peers on tombstone or dropped stores (#24726):store/tikv/mockstore/mocktikv/pd.go
 	if store == nil {
 		return nil, fmt.Errorf("invalid store ID %d, not found", storeID)
 	}