From 08fe1deb76f6b663d49fdd3fa640506c77d3816b Mon Sep 17 00:00:00 2001
From: disksing <i@disksing.com>
Date: Tue, 7 Mar 2017 18:58:44 +0800
Subject: [PATCH 1/2] store/tikv: drop the unreachable store's regions from
 cache.

---
 store/tikv/region_cache.go      |  8 ++++++++
 store/tikv/region_cache_test.go | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/store/tikv/region_cache.go b/store/tikv/region_cache.go
index 05086e6eb65bc..0e9a07eed18f6 100644
--- a/store/tikv/region_cache.go
+++ b/store/tikv/region_cache.go
@@ -326,6 +326,14 @@ func (c *RegionCache) OnRequestFail(ctx *RPCContext) {
 	c.storeMu.Lock()
 	delete(c.storeMu.stores, storeID)
 	c.storeMu.Unlock()
+
+	c.mu.Lock()
+	for id, r := range c.mu.regions {
+		if r.peer.GetStoreId() == storeID {
+			c.dropRegionFromCache(id)
+		}
+	}
+	c.mu.Unlock()
 }
 
 // OnRegionStale removes the old region and inserts new regions into the cache.
diff --git a/store/tikv/region_cache_test.go b/store/tikv/region_cache_test.go
index b08c2a7463fb5..bf70229e6bdfe 100644
--- a/store/tikv/region_cache_test.go
+++ b/store/tikv/region_cache_test.go
@@ -254,6 +254,28 @@ func (s *testRegionCacheSuite) TestRequestFail(c *C) {
 	c.Assert(region.unreachableStores, HasLen, 0)
 }
 
+func (s *testRegionCacheSuite) TestRequestFail2(c *C) {
+	// ['' - 'm' - 'z']
+	region2 := s.cluster.AllocID()
+	newPeers := s.cluster.AllocIDs(2)
+	s.cluster.Split(s.region1, region2, []byte("m"), newPeers, newPeers[0])
+
+	// Check the two regions.
+	loc1, err := s.cache.LocateKey(s.bo, []byte("a"))
+	c.Assert(err, IsNil)
+	c.Assert(loc1.Region.id, Equals, s.region1)
+	loc2, err := s.cache.LocateKey(s.bo, []byte("x"))
+	c.Assert(err, IsNil)
+	c.Assert(loc2.Region.id, Equals, region2)
+
+	// Request fails on region1.
+	ctx, _ := s.cache.GetRPCContext(s.bo, loc1.Region)
+	s.cache.OnRequestFail(ctx)
+	// Both region2 and store should be dropped from cache.
+	c.Assert(s.cache.storeMu.stores, HasLen, 0)
+	c.Assert(s.cache.getRegionFromCache([]byte("x")), IsNil)
+}
+
 func (s *testRegionCacheSuite) TestUpdateStoreAddr(c *C) {
 	client := &RawKVClient{
 		clusterID:   0,

From 34b531210a8849cb5199ecc7cf0f639d5aaaa0a1 Mon Sep 17 00:00:00 2001
From: disksing <i@disksing.com>
Date: Wed, 8 Mar 2017 11:05:41 +0800
Subject: [PATCH 2/2] update test.

---
 store/tikv/region_cache_test.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/store/tikv/region_cache_test.go b/store/tikv/region_cache_test.go
index bf70229e6bdfe..04331de5d4b01 100644
--- a/store/tikv/region_cache_test.go
+++ b/store/tikv/region_cache_test.go
@@ -202,7 +202,7 @@ func (s *testRegionCacheSuite) TestSplit(c *C) {
 }
 
 func (s *testRegionCacheSuite) TestMerge(c *C) {
-	// ['' - 'm' - 'z']
+	// key range: ['' - 'm' - 'z']
 	region2 := s.cluster.AllocID()
 	newPeers := s.cluster.AllocIDs(2)
 	s.cluster.Split(s.region1, region2, []byte("m"), newPeers, newPeers[0])
@@ -255,7 +255,7 @@ func (s *testRegionCacheSuite) TestRequestFail(c *C) {
 }
 
 func (s *testRegionCacheSuite) TestRequestFail2(c *C) {
-	// ['' - 'm' - 'z']
+	// key range: ['' - 'm' - 'z']
 	region2 := s.cluster.AllocID()
 	newPeers := s.cluster.AllocIDs(2)
 	s.cluster.Split(s.region1, region2, []byte("m"), newPeers, newPeers[0])
@@ -268,12 +268,15 @@ func (s *testRegionCacheSuite) TestRequestFail2(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(loc2.Region.id, Equals, region2)
 
-	// Request fails on region1.
+	// Request should fail on region1.
 	ctx, _ := s.cache.GetRPCContext(s.bo, loc1.Region)
+	c.Assert(s.cache.storeMu.stores, HasLen, 1)
+	s.checkCache(c, 2)
 	s.cache.OnRequestFail(ctx)
 	// Both region2 and store should be dropped from cache.
 	c.Assert(s.cache.storeMu.stores, HasLen, 0)
 	c.Assert(s.cache.getRegionFromCache([]byte("x")), IsNil)
+	s.checkCache(c, 1)
 }
 
 func (s *testRegionCacheSuite) TestUpdateStoreAddr(c *C) {