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

br: Fix new collaction enable check (#33500) #33533

Merged
merged 4 commits into from
Jun 16, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 29, 2022

cherry-pick #33500 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/33533

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

git push git@github.com:ti-srebot/tidb.git pr/33533:release-5.3-8f8dfafc105d

What problem does this PR solve?

Issue Number: close #33422

Problem Summary:

What is changed and how it works?

  • backup up-stream NewCollactionEnable into backupmeta
  • check NewCollactionEnable in backupmeta is the same as the down-stream

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Fix the issue that NewCollationEnable config not checked during restoration.

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

ti-chi-bot commented Mar 29, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • fengou1

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-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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 Mar 29, 2022
@ti-srebot ti-srebot added component/br This issue is related to BR of TiDB. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.3-cherry-pick labels Mar 29, 2022
@ti-srebot ti-srebot added this to the v5.3.1 milestone Mar 29, 2022
@ti-srebot
Copy link
Contributor Author

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

@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
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
Copy link
Member

joccau commented Jun 14, 2022

/cc @fengou1

@ti-chi-bot ti-chi-bot requested a review from fengou1 June 14, 2022 13:03
@joccau
Copy link
Member

joccau commented Jun 14, 2022

/run-integration-br-test

@joccau
Copy link
Member

joccau commented Jun 15, 2022

/run-unit-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 15, 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 16, 2022
@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1bb82cd

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 16, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jun 16, 2022

@ti-chi-bot
Copy link
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.

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 bf81222 into pingcap:release-5.3 Jun 16, 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. component/br This issue is related to BR of TiDB. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.3-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants