Skip to content

executor: Fix unstable TestTiDBLastTxnInfoCommitMode (#24779)#25160

Merged
ti-chi-bot merged 3 commits intopingcap:release-5.0from
ti-srebot:release-5.0-bcfe952921ea
Jun 4, 2021
Merged

executor: Fix unstable TestTiDBLastTxnInfoCommitMode (#24779)#25160
ti-chi-bot merged 3 commits intopingcap:release-5.0from
ti-srebot:release-5.0-bcfe952921ea

Conversation

@ti-srebot
Copy link
Contributor

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

cherry-pick #24779 to release-5.0
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/25160

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

git push git@github.com:ti-srebot/tidb.git pr/25160:release-5.0-bcfe952921ea

What problem does this PR solve?

Issue Number: close #24774

Problem Summary:
The test case TestTiDBLastTxnInfoCommitMode is unstable, because in the case it assumes when AsyncCommit.SafeWindow = 0 the async commit / 1pc will surely fallback, which is incorrect.

What is changed and how it works?

What's Changed:
Use the failpoint invalidMaxCommitTS instead of setting SafeWindow = 0 to trigger falling back.

Related changes

Check List

Tests

  • Unit test

Side effects

Release note

  • No release note

@MyonKeminta @ti-srebot
cherry pick pingcap#24779 to release-5.0
a94f072 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested a review from a team as a code owner June 4, 2021 08:57
@ti-srebot ti-srebot requested review from wshwsh12 and removed request for a team June 4, 2021 08:57
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Jun 4, 2021

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Jun 4, 2021
Merged
@ti-srebot ti-srebot added sig/execution SIG execution sig/transaction SIG:Transaction size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/5.0-cherry-pick labels Jun 4, 2021
@ti-srebot ti-srebot requested review from cfzjywxk and sticnarf June 4, 2021 08:57
@ti-srebot ti-srebot added this to the v5.0.2 milestone Jun 4, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Jun 4, 2021

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

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 4, 2021
sticnarf
sticnarf approved these changes Jun 4, 2021
View reviewed changes
Copy link
Contributor

@sticnarf sticnarf 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 4, 2021
cfzjywxk
cfzjywxk approved these changes Jun 4, 2021
View reviewed changes
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
Copy link
Member

ti-chi-bot commented Jun 4, 2021

@cfzjywxk: Please use GitHub review feature instead of /lgtm [cancel] when you want to submit review to the pull request.
For how to use GitHub review feature, see also this document provided by GitHub.

For the reason we drop support to the commands, see also this page.
This reply is being used as a temporary reply during the migration of review process and will be removed on July 1st.

Details

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

ti-chi-bot commented Jun 4, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • sticnarf

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.

Details

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 4, 2021
@bb7133
Copy link
Member

bb7133 commented Jun 4, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 4, 2021

@bb7133: /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.

Details

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.

@cfzjywxk
Copy link
Contributor

cfzjywxk commented Jun 4, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 4, 2021

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

DetailsCommit hash: a94f072

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

ti-chi-bot commented Jun 4, 2021

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

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 merged commit 4abe755 into pingcap:release-5.0 Jun 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cfzjywxk cfzjywxk cfzjywxk approved these changes

@sticnarf sticnarf sticnarf approved these changes

@wshwsh12 wshwsh12 Awaiting requested review from wshwsh12

Assignees

@MyonKeminta MyonKeminta

Labels

cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution sig/transaction SIG:Transaction size/XS Denotes a PR that changes 0-9 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.0-cherry-pick

Projects

None yet

Milestone

v5.0.2

Development

Successfully merging this pull request may close these issues.

7 participants

@ti-srebot @ti-chi-bot @bb7133 @cfzjywxk @sticnarf @MyonKeminta @zhouqiang-cl