Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

store/tikv: drop the unreachable store's regions from cache. #2792

Merged
merged 5 commits into from
Mar 8, 2017
Merged

store/tikv: drop the unreachable store's regions from cache. #2792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08fe1de
store/tikv: drop the unreachable store's regions from cache.
disksing Mar 7, 2017
25ddbcb
Merge branch 'master' into disksing/request-fail
AndreMouche Mar 7, 2017
b7aa920
Merge branch 'master' into disksing/request-fail
AndreMouche Mar 8, 2017
34b5312
update test.
disksing Mar 8, 2017
fd22bae
Merge branch 'master' into disksing/request-fail
disksing Mar 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions store/tikv/region_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
27 changes: 26 additions & 1 deletion store/tikv/region_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -254,6 +254,31 @@ func (s *testRegionCacheSuite) TestRequestFail(c *C) {
c.Assert(region.unreachableStores, HasLen, 0)
}

func (s *testRegionCacheSuite) TestRequestFail2(c *C) {
// key range: ['' - '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 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)
Copy link
Member

@coocood coocood Mar 8, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If only one store is used, why there is still one region in the cache?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

region1 is not removed, we have to try its other peers before reload it from pd, because pd may not be updated in time.

}

func (s *testRegionCacheSuite) TestUpdateStoreAddr(c *C) {
client := &RawKVClient{
clusterID: 0,
Expand Down