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

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

Merged
merged 13 commits into from
Apr 28, 2022
Merged

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

merged 13 commits into from
Apr 28, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 29, 2022 •
edited
Loading

cherry-pick #33500 to release-5.4
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/33532

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

git push git@github.com:ti-srebot/tidb.git pr/33532:release-5.4-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.

@joccau @ti-srebot
cherry pick pingcap#33500 to release-5.4
7f60040 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 29, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • fengou1
  • joccau

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 mentioned this pull request Mar 29, 2022
Merged
12 tasks
@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.4-cherry-pick labels Mar 29, 2022
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 27, 2022
@3pointer
Copy link
Contributor

/run-integration-br-tests

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 27, 2022
@3pointer
Copy link
Contributor

/run-integration-br-tests

@3pointer
Copy link
Contributor

/run-integration-br-tests

@3pointer
Copy link
Contributor

/run-integration-br-tests

@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 27, 2022
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 27, 2022
@3pointer
Copy link
Contributor

/run-integration-br-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 27, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/a942df9a4d1232ca3a242d1281c49a49750f41da

@3pointer
Copy link
Contributor

/run-integration-br-tests

@3pointer
Copy link
Contributor

/run-integration-br-tests

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 28, 2022
@3pointer
Copy link
Contributor

/run-integration-br-tests

joccau
joccau approved these changes Apr 28, 2022
View reviewed changes
Copy link
Member

@joccau joccau 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 28, 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: 603331c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 28, 2022
@ti-chi-bot ti-chi-bot merged commit 95fc56b into pingcap:release-5.4 Apr 28, 2022
@purelind purelind added this to the v5.4.1 milestone Apr 29, 2022
@fubinzh fubinzh mentioned this pull request Jul 19, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fengou1 fengou1 fengou1 approved these changes

@joccau joccau joccau approved these changes

@3pointer 3pointer Awaiting requested review from 3pointer

@kennytm kennytm Awaiting requested review from kennytm

@YuJuncen YuJuncen Awaiting requested review from YuJuncen

Assignees

@joccau joccau

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/XL Denotes a PR that changes 500-999 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.4-cherry-pick
Projects
None yet
Milestone
v5.4.1
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @ti-chi-bot @3pointer @sre-bot @joccau @fengou1 @VelocityLight @purelind