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: Continue GC when error happens during UnsafeDestroyRange #10743

Merged
merged 21 commits into from
Jun 21, 2019
Merged

store/tikv: Continue GC when error happens during UnsafeDestroyRange #10743

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
533b63d
Skip errors when unsafe destroy range failed
MyonKeminta Jun 9, 2019
e16dd35
Add unit tests; fix metrics
MyonKeminta Jun 11, 2019
592b591
Handle error returned by unsafe destroy range
MyonKeminta Jun 12, 2019
e424942
Merge branch 'master' into misono/fix-unsafe-destroy-range
MyonKeminta Jun 12, 2019
2f89696
Add logs to debug the integration test
MyonKeminta Jun 13, 2019
eac96d0
Merge branch 'master' into misono/fix-unsafe-destroy-range
MyonKeminta Jun 13, 2019
718f3a5
Fix tests
MyonKeminta Jun 14, 2019
45c97ef
Merge branch 'master' into misono/fix-unsafe-destroy-range
MyonKeminta Jun 14, 2019
26e9241
Remove debug log
MyonKeminta Jun 14, 2019
e7a2860
Merge branch 'misono/fix-unsafe-destroy-range' of https://github.com/…
MyonKeminta Jun 14, 2019
0e0a197
Cover error handling in response
MyonKeminta Jun 17, 2019
344d8ed
Fix the naming to make the lint happy
MyonKeminta Jun 17, 2019
96d8608
Merge branch 'master' into misono/fix-unsafe-destroy-range
MyonKeminta Jun 17, 2019
1f8837f
Address comments
MyonKeminta Jun 18, 2019
8db81f6
Merge branch 'misono/fix-unsafe-destroy-range' of https://github.com/…
MyonKeminta Jun 18, 2019
a05a984
Merge branch 'master' of https://github.com/pingcap/tidb into misono/…
MyonKeminta Jun 19, 2019
929b89d
Merge branch 'master' into misono/fix-unsafe-destroy-range
MyonKeminta Jun 19, 2019
8d49c0f
Merge branch 'master' into misono/fix-unsafe-destroy-range
MyonKeminta Jun 20, 2019
fa87e0c
Merge branch 'master' into misono/fix-unsafe-destroy-range
AndreMouche Jun 20, 2019
4903c5c
Merge branch 'master' into misono/fix-unsafe-destroy-range
MyonKeminta Jun 20, 2019
c4c85d8
Merge branch 'master' into misono/fix-unsafe-destroy-range
MyonKeminta Jun 21, 2019
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
Prev Previous commit
Next Next commit
Fix the naming to make the lint happy 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
  • Loading branch information
@MyonKeminta
MyonKeminta committed Jun 17, 2019
commit 344d8edefa536e5e8e1bcbdf2d3f7b1e96e0ce80
6 changes: 3 additions & 3 deletions store/tikv/gcworker/gc_worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ func (s *testGCWorkerSuite) TestCheckGCMode(c *C) {
}

const (
failRpcErr = 0
failRPCErr = 0
failNilResp = 1
failErrResp = 2
)
Expand Down Expand Up @@ -369,7 +369,7 @@ func (s *testGCWorkerSuite) testDeleteRangesFailureImpl(c *C, failType int) {
UnsafeDestroyRange: &kvrpcpb.UnsafeDestroyRangeResponse{},
}
if bytes.Equal(req.UnsafeDestroyRange.GetStartKey(), failKey) && addr == failStore.GetAddress() {
if failType == failRpcErr {
if failType == failRPCErr {
return nil, errors.New("error")
} else if failType == failNilResp {
resp.UnsafeDestroyRange = nil
Expand Down Expand Up @@ -430,7 +430,7 @@ func (s *testGCWorkerSuite) testDeleteRangesFailureImpl(c *C, failType int) {
}

func (s *testGCWorkerSuite) TestDeleteRangesFailure(c *C) {
s.testDeleteRangesFailureImpl(c, failRpcErr)
s.testDeleteRangesFailureImpl(c, failRPCErr)
s.testDeleteRangesFailureImpl(c, failNilResp)
s.testDeleteRangesFailureImpl(c, failErrResp)
}
Expand Down