locate: fix TestTiKVClientReadTimeout #1601
Merged
+7
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: zyguan <zhongyangguan@gmail.com>
ti-chi-bot
bot
added
dco-signoff: yes
cfzjywxk
reviewed
Feb 28, 2025
| s.vars.sendTimes++ | ||
|
|
||
| if s.vars.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 sendCtx.Err() != nil && errors.Cause(sendCtx.Err()) == context.Canceled { | ||
| metrics.TiKVRPCErrorCounter.WithLabelValues("context-canceled", storeIDLabel(s.vars.rpcCtx)).Inc() | ||
| if canceled { |
There was a problem hiding this comment.
Isn't the logic equivalent checking sendCtx here? 👀
cfzjywxk
approved these changes
Feb 28, 2025
ti-chi-bot
bot
added
needs-1-more-lgtm
ekexium
approved these changes
Mar 4, 2025
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cfzjywxk, ekexium The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ref #1565 (comment)