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

executor: reject setting read ts to a future time (#25732) #25763

Merged
merged 6 commits into from
Jul 20, 2021
Merged

executor: reject setting read ts to a future time (#25732) #25763

merged 6 commits into from
Jul 20, 2021

Conversation

ti-srebot
Copy link
Contributor

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

cherry-pick #25732 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/25763

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

git push [email protected]:ti-srebot/tidb.git pr/25763:release-5.1-92ddceb6a4ab

What problem does this PR solve?

Issue Number: close #25680

What is changed and how it works?

This PR checks the read ts in two cases:

  • Set by tidb_snapshot system variable
  • Stale read

It first checks with latest local timestamp (with low cost). If the check fails, it gets a timestamp from PD to do a double check.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

  • Performance regression
    • Consumes more CPU
  • Breaking backward compatibility

Release note

  • Do not allow setting read timestamp to a future time.

@ti-srebot ti-srebot requested review from a team as code owners June 25, 2021 10:12
@ti-srebot ti-srebot requested review from qw4990 and removed request for a team June 25, 2021 10:12
@ti-srebot
Copy link
Contributor Author

/run-all-tests

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

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

@sticnarf
Copy link
Contributor

PTAL @nolouch @Yisaer

nolouch
nolouch approved these changes Jul 15, 2021
View reviewed changes
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
Copy link
Member

@nolouch: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

lgtm

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 ti-community-infra/tichi repository.

@nolouch nolouch removed the sig/execution SIG execution label Jul 15, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 15, 2021
@github-actions github-actions bot added the sig/execution SIG execution label Jul 15, 2021
@ti-chi-bot
Copy link
Member

@youjiali1995: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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 ti-community-infra/tichi repository.

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 15, 2021
@nolouch
Copy link
Member

nolouch commented Jul 19, 2021

PTAl @Yisaer

@AilinKid
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@AilinKid: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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 ti-community-infra/tichi repository.

@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 Jul 20, 2021
@youjiali1995
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@youjiali1995: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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 ti-community-infra/tichi repository.

@youjiali1995 youjiali1995 added the sig/transaction SIG:Transaction label Jul 20, 2021
@youjiali1995
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: e49f989

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 20, 2021
@ti-chi-bot ti-chi-bot merged commit b1f47e7 into pingcap:release-5.1 Jul 20, 2021
@nolouch nolouch mentioned this pull request Jul 22, 2021
Closed
@zhouqiang-cl zhouqiang-cl added this to the v5.1.1 milestone Jul 26, 2021
@AilinKid AilinKid mentioned this pull request Jul 29, 2021
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AilinKid AilinKid AilinKid approved these changes

@youjiali1995 youjiali1995 youjiali1995 approved these changes

@Yisaer Yisaer Yisaer approved these changes

@nolouch nolouch nolouch approved these changes

@qw4990 qw4990 Awaiting requested review from qw4990

@cfzjywxk cfzjywxk Awaiting requested review from cfzjywxk

@NingLin-P NingLin-P Awaiting requested review from NingLin-P

Assignees

@sticnarf sticnarf

Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution sig/transaction SIG:Transaction 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
v5.1.1
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @sticnarf @ti-chi-bot @nolouch @AilinKid @youjiali1995 @Yisaer @zhouqiang-cl