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.

Sign up for GitHub

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

Jump to bottom

config, session: make Local Transaction not to affect Stale Read (#25559) #25668

Merged
merged 3 commits into from
Jun 22, 2021
Merged

config, session: make Local Transaction not to affect Stale Read (#25559) #25668

merged 3 commits into from
Jun 22, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 22, 2021 •
edited
Loading

cherry-pick #25559 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/25668

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

git push [email protected]:ti-srebot/tidb.git pr/25668:release-5.1-b858ce43c01d

Signed-off-by: JmPotato [email protected]

What problem does this PR solve?

Close #25479.

Decouple Stale Read and Local Txn by adding a new system variable named EnableLocalTxn. Should merge after #25525.

What is changed and how it works?

Because both Stale Read and Local Txn need the zone label to determine their behavior, however, the latter is not released yet, to make sure they will not bother each other. I add a system variable EnableLocalTxn to disable Local Txn.

Related changes

Check List

Tests

  • Unit test
  • Integration test

Release note

  • No release note.

@ti-srebot ti-srebot requested review from a team as code owners June 22, 2021 09:25
@ti-srebot ti-srebot requested review from wshwsh12 and hanfei1991 and removed request for a team June 22, 2021 09:25
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Jun 22, 2021
Merged
@ti-srebot ti-srebot added component/config component/expression sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.1-cherry-pick labels Jun 22, 2021
@ti-srebot
Copy link
Contributor Author

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

@JmPotato
Resolve the conflicts
3f79c23 
Signed-off-by: JmPotato <[email protected]>
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 22, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 22, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Yisaer
  • xhebox

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 22, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 3f79c23

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 22, 2021
@zhouqiang-cl
Copy link
Contributor

@ti-chi-bot

@zhouqiang-cl
Copy link
Contributor

/merge

@zhouqiang-cl
Copy link
Contributor

@ti-chi-bot

@zhouqiang-cl
Copy link
Contributor

/run-unit-tests

@zhouqiang-cl
Copy link
Contributor

/run-check_dev

@ti-chi-bot ti-chi-bot merged commit ffba3ee into pingcap:release-5.1 Jun 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xhebox xhebox xhebox approved these changes

@Yisaer Yisaer Yisaer approved these changes

@wshwsh12 wshwsh12 Awaiting requested review from wshwsh12

@hanfei1991 hanfei1991 Awaiting requested review from hanfei1991

@nolouch nolouch Awaiting requested review from nolouch

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/config component/expression sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/L Denotes a PR that changes 100-499 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @ti-chi-bot @zhouqiang-cl @xhebox @Yisaer @JmPotato