-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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.
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
txn: fix retried transactions' statements is not inclueded in TIDB_TRX (#28480) #28716
base: release-5.1
Are you sure you want to change the base?
Conversation
Signed-off-by: ti-srebot <[email protected]>
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team. To merge this cherry pick, it must first be approved by the collaborators. AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
/run-all-tests |
@longfangsong you're already a collaborator in bot's repo. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
cherry-pick #28480 to release-5.1
You can switch your code base to this Pull Request by using git-extras:
# In tidb repo: git pr https://github.com/pingcap/tidb/pull/28716
After apply modifications, you can push your change to this PR via:
What problem does this PR solve?
Problem Summary:
Currently the retried transactions' statements won't be inclueded in TIDB_TRX.
The reason is:
If we meet an retryable error here:
tidb/session/session.go
Line 701 in 091ae3b
note the origin datasource of TIDB_TRX for this transaction is resetted here inside
doCommit
:tidb/session/session.go
Line 489 in 091ae3b
(and will be resetted again here if retry more than once):
tidb/session/session.go
Line 972 in 091ae3b
But during retrying, we use
st.Exec
(which may restart the transaction withsession.Txn
) instead ofsession.ExecStament
, andst.Exec
will not record statements.tidb/session/session.go
Line 929 in 091ae3b
What is changed and how it works?
What's Changed:
Collect them during retry.
Check List
Tests
Side effects
Documentation
Release note