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: fix begin statement consumed read_ts wrongly (#25492) #25520

Merged
merged 2 commits into from
Jun 18, 2021

Conversation

ti-srebot
Copy link
Contributor

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

cherry-pick #25492 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/25520

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

git push git@github.com:ti-srebot/tidb.git pr/25520:release-5.1-9e08fc559c81

Signed-off-by: yisaer disxiaofei@163.com

What problem does this PR solve?

The following behavior is not expected.

mysql> set transaction read only as of timestamp '2021-06-16 11:20:00';
Query OK, 0 rows affected (0.05 sec)

mysql> delete from t1 where id=3;
ERROR 1105 (HY000): only support read-only statement during read-only staleness transactions
mysql> commit;
Query OK, 0 rows affected (0.05 sec)

mysql> start transaction read only as of timestamp now()-interval 1 minute;
ERROR 1105 (HY000): start transaction read only as of is forbidden after set transaction read only as of
mysql> start transaction read only as of timestamp now()-interval 1 minute;
Query OK, 0 rows affected (0.05 sec)

What is changed and how it works?

Fix that the read_ts would be consumed wrongly.

Check List

Tests

  • Unit test

Release note

  • No release note

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested review from a team as code owners June 17, 2021 07:51
@ti-srebot ti-srebot requested review from wshwsh12 and lzmhhh123 and removed request for a team June 17, 2021 07:51
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.1-cherry-pick labels Jun 17, 2021
@ti-srebot
Copy link
Contributor Author

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

@github-actions github-actions bot added the sig/execution SIG execution label Jun 17, 2021
@ti-chi-bot
Copy link
Member

@xhebox: 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.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 17, 2021
@guo-shaoge guo-shaoge removed the request for review from XuHuaiyu June 18, 2021 02:06
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 18, 2021
@Yisaer
Copy link
Contributor

Yisaer commented Jun 18, 2021

/merge

@ti-chi-bot
Copy link
Member

@Yisaer: /merge in this pull request requires 2 approval(s).

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.

Copy link
Contributor

@Yisaer Yisaer left a comment

Choose a reason for hiding this comment

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

lgtm

@Yisaer
Copy link
Contributor

Yisaer commented Jun 18, 2021

/sig sql-infra

@ti-chi-bot ti-chi-bot added the sig/sql-infra SIG: SQL Infra label Jun 18, 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 18, 2021
@xhebox
Copy link
Contributor

xhebox commented Jun 18, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f015587

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 18, 2021
@ti-chi-bot ti-chi-bot merged commit 38175b9 into pingcap:release-5.1 Jun 18, 2021
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 sig/sql-infra SIG: SQL Infra 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.

5 participants