store/tikv: Fix the issue that context canceled error during commit RPC is not treated as undetermined error (#20857) #20925
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
|
/run-all-tests |
ti-srebot
added
component/tikv
type/4.0-cherry-pick
type/bugfix
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
MyonKeminta
force-pushed
the
release-4.0-af8dee160e11
branch
from
f72b0b4
to
48a2dcf
Compare
|
LGTM |
ti-srebot
added
status/LGT2
|
/merge |
|
Sorry @cfzjywxk, this branch cannot be merged without an approval of release maintainers |
|
Never mind, my issue is related to this TODO: Line 1028 in 1702608 |
|
/approve |
|
/merge |
ti-srebot
added
status/can-merge
zz-jason
approved these changes
Nov 11, 2020
|
/run-all-tests |
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.
cherry-pick #20857 to release-4.0
What problem does this PR solve?
Issue Number: close #20733
#20030 introduced an issue: When a transaction's commit request to primary gets an context canceled error during RPC, it's returned early without setting the sender's
rpcErrorfield, however 2pc committer need to check that field to check if the transaction should be in undetermined state. In this case, we don't know if TiKV have received and handled the request successfully, so it should be undetermined. The problem also exists when context canceled occurs during prewrite requests of async commit transactions.What is changed and how it works?
This PR moves the
s.rpcError = errstatement before returning context error, and adds some failpoint tests. However I think my tests are too tricky and I didn't find better way..Related changes
Check List
Tests
Side effects
-
Release note