Skip to content

*: Revert #33519 for performance fallback and fix the #33509 in another way (#34425)#34432

Merged
ti-chi-bot merged 6 commits into
pingcap:release-5.3from
ti-srebot:release-5.3-1f9d34aeef35
Jun 15, 2022
Merged

*: Revert #33519 for performance fallback and fix the #33509 in another way (#34425)#34432
ti-chi-bot merged 6 commits into
pingcap:release-5.3from
ti-srebot:release-5.3-1f9d34aeef35

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

@ti-srebot ti-srebot commented May 6, 2022

cherry-pick #34425 to release-5.3
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/34432

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

git push git@github.com:ti-srebot/tidb.git pr/34432:release-5.3-1f9d34aeef35

This reverts commit 5004a81.

What problem does this PR solve?

Issue Number: close #33509

Problem Summary:

What is changed and how it works?

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented May 6, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • 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.

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 do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 6, 2022
@ti-srebot
Copy link
Copy Markdown
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 6, 2022
@ti-srebot ti-srebot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.3-cherry-pick labels May 6, 2022
@ti-srebot ti-srebot requested review from cfzjywxk and tiancaiamao May 6, 2022 13:28
@ti-srebot ti-srebot added this to the v5.3.1 milestone May 6, 2022
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 6, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jun 14, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 14, 2022
@lcwangchao
Copy link
Copy Markdown
Collaborator

/run-unit-test

@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Jun 14, 2022

@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 14, 2022
@tiancaiamao
Copy link
Copy Markdown
Contributor

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

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

DetailsCommit hash: dbb56ef

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

/run-unit-test

@ti-chi-bot
Copy link
Copy Markdown
Member

@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 d4f1d2d into pingcap:release-5.3 Jun 15, 2022
@heibaijian heibaijian modified the milestones: v5.3.1, v5.3.2 Jun 20, 2022
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. release-note-none Denotes a PR that doesn't merit a release note. 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.3-cherry-pick

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants