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

planner: forbid prepared stale select in txn (#25375) #25413

Merged
merged 2 commits into from
Jun 15, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 15, 2021

cherry-pick #25375 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/25413

After apply modifications, you can push your change to this PR via:

git push [email protected]:ti-srebot/tidb.git pr/25413:release-5.1-07d0b2d84522

Signed-off-by: xhe [email protected]

What problem does this PR solve?

Problem Summary: #25156 (comment). Forbid prepared stale select in all txns.

What is changed and how it works?

What's Changed:

  1. Prepared stale select is forbidden in all txn.
  2. Error is refined. Unknown error!%(Extra string..., the original error is like so. It is so ugly.

Check List

Tests

  • Unit test
  • Integration test

Release note

  • Forbid prepared stale select in transactions

@ti-srebot ti-srebot requested review from a team as code owners June 15, 2021 06:31
@ti-srebot ti-srebot requested review from XuHuaiyu and removed request for a team June 15, 2021 06:31
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/execution SIG execution size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.1-cherry-pick labels Jun 15, 2021
@ti-srebot ti-srebot requested review from nolouch and Yisaer June 15, 2021 06:31
@ti-srebot
Copy link
Contributor Author

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

@nolouch nolouch removed the sig/execution SIG execution label Jun 15, 2021
Copy link
Member

@nolouch nolouch 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 the status/LGT1 Indicates that a PR has LGTM 1. label Jun 15, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 15, 2021
@github-actions github-actions bot added the sig/execution SIG execution label Jun 15, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Yisaer
  • nolouch

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 15, 2021
@Yisaer
Copy link
Contributor

Yisaer commented Jun 15, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1b70e0f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 15, 2021
@ti-chi-bot ti-chi-bot merged commit f0fd795 into pingcap:release-5.1 Jun 15, 2021
@xhebox xhebox deleted the release-5.1-07d0b2d84522 branch June 15, 2021 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution size/S Denotes a PR that changes 10-29 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. type/5.1-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants