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) #33534

Closed
wants to merge 10 commits into from
Closed

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

wants to merge 10 commits into from

Conversation

ti-srebot
Copy link
Contributor

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

cherry-pick #33500 to release-5.2
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/33534

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

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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 29, 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/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. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Mar 29, 2022
@ti-srebot
Copy link
Contributor Author

/run-all-tests

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

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

@joccau
cherry pick pingcap#33500 to release-5.2
63cc7fa 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau joccau force-pushed the release-5.2-8f8dfafc105d branch from 7d3394d to 93d1f76 Compare April 13, 2022 06:49
joccau added 3 commits April 13, 2022 15:10
@joccau
update kvproto package
a05407d 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
Add interface GetTableValueInSystemDB() to get config in mysql.tidb
17a72ac 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
remove test case
79e68e1 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau joccau force-pushed the release-5.2-8f8dfafc105d branch from 93d1f76 to 79e68e1 Compare April 13, 2022 09:57
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 13, 2022
@joccau
Copy link
Member

joccau commented Apr 13, 2022 •
edited
Loading

Manual test (add detailed scripts or steps below)

  1. test backup
  • run command
    ./bin/br backup full -u $IP:$port -s "s3://tmp/full?access-key=minioadmin&secret-access-key=minioadmin&endpoint=http://$IP:9000&force-path-style=true"
  • to find log
    [2022/04/14 11:41:58.014 +08:00] [INFO] [backup.go:228] ["get new_collations_enabled_on_first_bootstrap config from system table"] [new_collations_enabled_on_first_bootstrap=False]

Integration test

br_s3 in code

@joccau
Copy link
Member

joccau commented Apr 13, 2022

/cc @fengou1 @WangLe1321 PTAL

@ti-chi-bot ti-chi-bot requested a review from fengou1 April 13, 2022 10:44
@ti-chi-bot
Copy link
Member

@joccau: GitHub didn't allow me to request PR reviews from the following users: PTAL.

Note that only pingcap members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @fengou1 @WangLe1321 PTAL

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot requested a review from WangLe1321 April 13, 2022 10:44
@joccau
add comments for function
27ceadb 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@ti-chi-bot
Copy link
Member

@joccau: GitHub didn't allow me to request PR reviews from the following users: PTAL.

Note that only pingcap members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @innerr PTAL

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 14, 2022
@joccau
Copy link
Member

joccau commented Apr 14, 2022

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 14, 2022
@joccau joccau force-pushed the release-5.2-8f8dfafc105d branch from 4af635d to ad6c52a Compare April 14, 2022 05:32
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 14, 2022
@joccau
Copy link
Member

joccau commented Apr 14, 2022

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 14, 2022
@joccau
Copy link
Member

joccau commented Apr 14, 2022

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 14, 2022
@joccau
update kvproto mod
2c49f0b 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
Copy link
Member

joccau commented Apr 14, 2022

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 14, 2022
@joccau
Copy link
Member

joccau commented Apr 14, 2022

/run-unit-test

2 similar comments
@joccau
Copy link
Member

joccau commented Apr 15, 2022

/run-unit-test

@kennytm
Copy link
Contributor

kennytm commented Apr 15, 2022

/run-unit-test

@sre-bot
Copy link
Contributor

sre-bot commented Apr 15, 2022 •
edited
Loading

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

@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 2c49f0b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 17, 2022
@joccau
Copy link
Member

joccau commented Jun 17, 2022

/unhold

@joccau
Copy link
Member

joccau commented Jun 17, 2022

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 17, 2022
@VelocityLight
Copy link

This pull request is closed because it's related version has closed automatic cherry-picking.
If it's still needed, you can reopen it or just regenerate it using bot,
see:

You can find more details at:

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joccau joccau joccau left review comments

@YuJuncen YuJuncen YuJuncen approved these changes

@3pointer 3pointer 3pointer approved these changes

@kennytm kennytm Awaiting requested review from kennytm

@fengou1 fengou1 Awaiting requested review from fengou1

@WangLe1321 WangLe1321 Awaiting requested review from WangLe1321

@bb7133 bb7133 Awaiting requested review from bb7133

Assignees

@joccau joccau

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/br This issue is related to BR of TiDB. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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.2-cherry-pick
Projects
None yet
Milestone
No milestone
Development

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