cache: clean up pending peers.

tikv · Mar 24, 2017 · f9fc32a · f9fc32a
1 parent f46ce0b
commit f9fc32a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/server/cache.go b/server/cache.go
@@ -610,7 +610,7 @@ func (c *clusterInfo) handleRegionHeartbeat(region *regionInfo) error {
 		if len(region.DownPeers) > 0 || len(region.PendingPeers) > 0 {
 			saveCache = true
 		}
-		if len(origin.DownPeers) > 0 || len(origin.DownPeers) > 0 {
+		if len(origin.DownPeers) > 0 || len(origin.PendingPeers) > 0 {
 			saveCache = true
 		}
 	}

diff --git a/server/cache_test.go b/server/cache_test.go
@@ -407,8 +407,13 @@ func (s *testClusterInfoSuite) testRegionHeartbeat(c *C, cache *clusterInfo) {
 		c.Assert(cache.handleRegionHeartbeat(region), IsNil)
 		checkRegions(c, cache.regions, regions[:i+1])
 
-		// Clear down and pending peers.
-		region.DownPeers, region.PendingPeers = nil, nil
+		// Clear down peers.
+		region.DownPeers = nil
+		c.Assert(cache.handleRegionHeartbeat(region), IsNil)
+		checkRegions(c, cache.regions, regions[:i+1])
+
+		// Clear pending peers.
+		region.PendingPeers = nil
 		c.Assert(cache.handleRegionHeartbeat(region), IsNil)
 		checkRegions(c, cache.regions, regions[:i+1])
 	}