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.

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

Merged
merged 5 commits into from
Oct 9, 2021

Conversation

longfangsong
Copy link
Contributor

@longfangsong longfangsong commented Sep 29, 2021

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:

err = s.doCommit(ctx)

note the origin datasource of TIDB_TRX for this transaction is resetted here inside doCommit:

s.txn.changeToInvalid()

(and will be resetted again here if retry more than once):

s.txn.changeToInvalid()

But during retrying, we use st.Exec(which may restart the transaction with session.Txn) instead of session.ExecStament, and st.Exec will not record statements.

_, err = st.Exec(ctx)

What is changed and how it works?

What's Changed:
Collect them during retry.

Check List

Tests

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 29, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • MyonKeminta
  • cfzjywxk

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 29, 2021
@longfangsong longfangsong marked this pull request as ready for review October 8, 2021 02:34
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 8, 2021
@longfangsong
Copy link
Contributor Author

/cc @MyonKeminta @cfzjywxk
And please also /cc the test case in automated-tests#851

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 8, 2021
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Oct 9, 2021
@cfzjywxk
Copy link
Contributor

cfzjywxk commented Oct 9, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: cceb7a1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 9, 2021
@ti-chi-bot ti-chi-bot merged commit 07eb99d into pingcap:master Oct 9, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Oct 9, 2021
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #28670

@MyonKeminta
Copy link
Contributor

@longfangsong Does 5.1 branch need this?

@longfangsong
Copy link
Contributor Author

longfangsong commented Oct 11, 2021

@longfangsong Does 5.1 branch need this?

Yes, we should cherry-pick this to 5.1 if possible.

However, it seems there are no 5.1 bug triage plan here

@longfangsong
Copy link
Contributor Author

/label needs-cherry-pick-5.1

@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #28716

@MyonKeminta
Copy link
Contributor

I just notice that it looks that the onStmtEnd function might be invoked multiple times on a same txn. If that's true, though it's not a problem currently according to the implementation of onStmtEnd, I think maybe we need someway to guarantee onStmtEnd to be reentrant. At least we need to add some comments to notice people to avoid breaking it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants