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

Jump to bottom

tikv: fix unexpected retry region request when context cancel (#20030) #20031

Merged
merged 3 commits into from
Sep 18, 2020
Merged

tikv: fix unexpected retry region request when context cancel (#20030) #20031

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98c9288
cherry pick #20030 to release-4.0
lzmhhh123 Sep 16, 2020
a2268da
Merge branch 'release-4.0' into release-4.0-1dcd15648048
ti-srebot Sep 17, 2020
39d8ecc
Merge branch 'release-4.0' into release-4.0-1dcd15648048
ti-srebot Sep 18, 2020
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
7 changes: 7 additions & 0 deletions store/tikv/region_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,13 @@ func (s *RegionRequestSender) sendReqToRegion(bo *Backoffer, rpcCtx *RPCContext,
}
resp, err = s.client.SendRequest(ctx, rpcCtx.Addr, req, timeout)
if err != nil {
// Because in rpc logic, context.Cancel() will be transferred to rpcContext.Cancel error. For rpcContext cancel,
// we need to retry the request. But for context cancel active, for example, limitExec gets the required rows,
// we shouldn't retry the request, it will go to backoff and hang in retry logic.
if ctx.Err() != nil && errors.Cause(ctx.Err()) == context.Canceled {
return nil, false, errors.Trace(ctx.Err())
}

s.rpcError = err
if e := s.onSendFail(bo, rpcCtx, err); e != nil {
return nil, false, errors.Trace(e)
Expand Down