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) #28716

Open
wants to merge 1 commit into
base: release-5.1
Choose a base branch
from

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Oct 11, 2021

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:

git push git@github.com:ti-srebot/tidb.git pr/28716:release-5.1-07eb99dce5eb

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

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 11, 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
Copy link
Member

@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

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.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. labels Oct 11, 2021
@ti-chi-bot ti-chi-bot removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Oct 11, 2021
@ti-srebot ti-srebot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/5.1-cherry-pick labels Oct 11, 2021
@ti-srebot ti-srebot added this to the v5.1.2 milestone Oct 11, 2021
@ti-srebot
Copy link
Contributor Author

@longfangsong you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 11, 2021
Copy link
Contributor

@cfzjywxk cfzjywxk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@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 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/cherry-pick-not-approved 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/LGT2 Indicates that a PR has LGTM 2. type/5.1-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants