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

tests: make TestIndexLookupMergeJoinHang and TestIssue18068 stable #23741

Merged
merged 5 commits into from
Apr 1, 2021
Merged

tests: make TestIndexLookupMergeJoinHang and TestIssue18068 stable #23741

merged 5 commits into from
Apr 1, 2021

Conversation

tangenta
Copy link
Contributor

What problem does this PR solve?

Problem Summary:

Failpoints MUST be used in the serial test suties.

#19765

What is changed and how it works?

NA

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Side effects

NA

Release note

  • No release note

@tangenta tangenta requested a review from a team as a code owner March 31, 2021 09:14
@tangenta tangenta requested review from wshwsh12 and lzmhhh123 and removed request for a team March 31, 2021 09:14
@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 31, 2021
@tangenta tangenta mentioned this pull request Mar 31, 2021
Merged
@github-actions github-actions bot added the sig/execution SIG execution label Mar 31, 2021
lysu
lysu reviewed Mar 31, 2021
View reviewed changes
Copy link
Contributor

@lysu lysu left a comment

Choose a reason for hiding this comment

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

/lgtm

@bb7133
Copy link
Member

bb7133 commented Mar 31, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 31, 2021
@bb7133
Copy link
Member

bb7133 commented Mar 31, 2021

/merge

@ti-chi-bot
Copy link
Member

@bb7133: /merge is only allowed for the committers in list.

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.

@zimulala
Copy link
Contributor

/LGTM

@ti-chi-bot
Copy link
Member

@zimulala: /lgtm is only allowed for the reviewers in list.

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.

@tangenta tangenta added the sig/sql-infra SIG: SQL Infra label Mar 31, 2021
xhebox
xhebox approved these changes Mar 31, 2021
View reviewed changes
Copy link
Contributor

@xhebox xhebox left a comment

Choose a reason for hiding this comment

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

/lgtm

@tiancaiamao
Copy link
Contributor

/LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • tiancaiamao

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • 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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 Mar 31, 2021
@tiancaiamao
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 15885ee

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

bb7133 commented Mar 31, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 31, 2021
@ti-chi-bot ti-chi-bot removed status/can-merge Indicates a PR has been approved by a committer. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 1, 2021
@tangenta
Copy link
Contributor Author

tangenta commented Apr 1, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d5b1ef4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 1, 2021
@ti-chi-bot ti-chi-bot merged commit 19919e3 into pingcap:master Apr 1, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Apr 1, 2021
@ti-srebot
cherry pick pingcap#23741 to release-5.0
46386fd 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Apr 1, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #23796

ti-chi-bot pushed a commit that referenced this pull request Jun 22, 2021
@ti-srebot
tests: make TestIndexLookupMergeJoinHang and TestIssue18068 stable (#…
749a99c 
…23741) (#23796)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lysu lysu lysu left review comments

@xhebox xhebox xhebox approved these changes

@wshwsh12 wshwsh12 Awaiting requested review from wshwsh12

@lzmhhh123 lzmhhh123 Awaiting requested review from lzmhhh123

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.0 sig/execution SIG execution sig/sql-infra SIG: SQL Infra 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@tangenta @bb7133 @ti-chi-bot @zimulala @tiancaiamao @ti-srebot @lysu @xhebox