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

Merged
merged 12 commits into from
Mar 28, 2022
Merged

br: Fix new collaction enable check #33500

merged 12 commits into from
Mar 28, 2022

Conversation

joccau
Copy link
Member

@joccau joccau commented Mar 28, 2022 •
edited by 3pointer
Loading

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.

@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • YuJuncen

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-chi-bot ti-chi-bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/needs-triage-completed and removed do-not-merge/needs-linked-issue labels Mar 28, 2022
@joccau
Copy link
Member Author

joccau commented Mar 28, 2022

/component br

@ti-chi-bot ti-chi-bot added the component/br This issue is related to BR of TiDB. label Mar 28, 2022
@joccau
Copy link
Member Author

joccau commented Mar 28, 2022

/cc @kennytm @YuJuncen @3pointer

3pointer
3pointer reviewed Mar 28, 2022
View reviewed changes
br/pkg/task/restore.go Outdated Show resolved Hide resolved
kennytm
kennytm reviewed Mar 28, 2022
View reviewed changes
br/pkg/glue/glue.go Outdated Show resolved Hide resolved
br/pkg/version/version.go Outdated Show resolved Hide resolved
@joccau joccau force-pushed the fix-newCollactionEnable-check branch from d2f79ea to 0cc7d82 Compare March 28, 2022 09:50
YuJuncen
YuJuncen approved these changes Mar 28, 2022
View reviewed changes
Copy link
Contributor

@YuJuncen YuJuncen 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 Mar 28, 2022
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 28, 2022
@joccau
Copy link
Member Author

joccau commented Mar 28, 2022

/run-integration-br-tests

@joccau
Copy link
Member Author

joccau commented Mar 28, 2022

/run-integration-br-tests

@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9dcf0eb

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 28, 2022
@3pointer 3pointer removed the needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. label Mar 28, 2022
@3pointer
Copy link
Contributor

/run-unit-test

@3pointer
Copy link
Contributor

3pointer commented Mar 28, 2022 •
edited
Loading

截屏2022-03-28 下午9 06 03

@3pointer 3pointer merged commit 8f8dfaf into pingcap:master Mar 28, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 28, 2022
@joccau @ti-srebot
cherry pick pingcap#33500 to release-6.0
3833cd1 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-6.0 in PR #33521

ti-chi-bot pushed a commit that referenced this pull request Mar 28, 2022
@ti-srebot
br: Fix new collaction enable check (#33500) (#33521)
d8e838e 
close #33422
@3pointer 3pointer added needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Mar 29, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 29, 2022
@joccau @ti-srebot
cherry pick pingcap#33500 to release-5.4
7f60040 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 29, 2022
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #33532

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 29, 2022
@joccau @ti-srebot
cherry pick pingcap#33500 to release-5.3
c9a9b3d 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 29, 2022
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #33533

@ti-srebot ti-srebot mentioned this pull request Mar 29, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #33534

@joccau joccau deleted the fix-newCollactionEnable-check branch March 30, 2022 06:26
joccau added a commit to ti-srebot/tidb that referenced this pull request Apr 13, 2022
@joccau
cherry pick pingcap#33500 to release-5.2
63cc7fa 
Signed-off-by: joccau <[email protected]>
ti-chi-bot pushed a commit that referenced this pull request Apr 28, 2022
@ti-srebot
br: Fix new collaction enable check (#33500) (#33532)
95fc56b 
close #33422
ti-chi-bot pushed a commit that referenced this pull request Jun 16, 2022
@ti-srebot
br: Fix new collaction enable check (#33500) (#33533)
bf81222 
close #33422
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

@YuJuncen YuJuncen YuJuncen approved these changes

@3pointer 3pointer 3pointer approved these changes

Assignees
No one assigned
Labels
component/br This issue is related to BR of TiDB. needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Record new_collation setting in br backup and compare new_collation during restore
7 participants
@joccau @ti-chi-bot @sre-bot @3pointer @ti-srebot @kennytm @YuJuncen