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: modify collate.newCollationEnabled according to the config of the cluster #39173

Merged
merged 9 commits into from
Nov 22, 2022
Merged

br: modify collate.newCollationEnabled according to the config of the cluster #39173

merged 9 commits into from
Nov 22, 2022

Conversation

MoCuishle28
Copy link
Contributor

@MoCuishle28 MoCuishle28 commented Nov 16, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #39150

Problem Summary:
The collate.newCollationEnabled variable is set to 1 when the collate package is initialized. When using this package, this value is not modified according to the config of the TiDB cluster (i.e., new_collations_enabled_on_first_bootstrap).

As a result, the user sets new_collations_enabled_on_first_bootstrap to false in the TiDB cluster, and it is still treated as true when br is executed.

What is changed and how it works?

Modify collate.newCollationEnabled according to the config of the cluster.

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

Manual test

  • create a cluster with tidb config new_collations_enabled_on_first_bootstrap: false.
  • create a table with collation 'utf8mb4_0900_ai_ci': create table books (id bigint auto_increment,name varchar(64), primary key (id)) CHARSET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
  • insert several records to the table.
  • execute a full backup
  • create another cluster tidb config new_collations_enabled_on_first_bootstrap: false.
  • restore the backup to the new cluster => success

Release note

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

Fix a bug that: "Error Unsupported collation when new collation is enabled: 'utf8mb4_0900_ai_ci'" even if new_collation_enabled is false.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 16, 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-triage-completed 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. labels Nov 16, 2022
@MoCuishle28
Copy link
Contributor Author

Due to the cycle import caused by importing the br/pkg/gluetidb package when writing unit tests, we moved the CheckNewCollationEnable func to the br/pkg/restore package and moved the const tidbNewCollationEnabled to the br/pkg/utils package.

@MoCuishle28 MoCuishle28 changed the title br: modify newCollationEnabled according to the config of the cluster br: modify collate.newCollationEnabled according to the config of the cluster Nov 16, 2022
@MoCuishle28
Copy link
Contributor Author

/run-check-dev-2

@MoCuishle28
Copy link
Contributor Author

/component br

@ti-chi-bot ti-chi-bot added component/br This issue is related to BR of TiDB. and removed do-not-merge/needs-triage-completed labels Nov 16, 2022
WangLe1321
WangLe1321 approved these changes Nov 18, 2022
View reviewed changes
Copy link
Contributor

@WangLe1321 WangLe1321 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
Copy link
Member

@WangLe1321: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

LGTM

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 added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 21, 2022
YuJuncen
YuJuncen approved these changes Nov 22, 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.

rest lgtm

br/pkg/restore/client.go Outdated Show resolved Hide resolved
@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 Nov 22, 2022
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. label Nov 22, 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: 1bbd49cc88fc41906c6d486bd4277e50a7db8798

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 22, 2022
@MoCuishle28
Copy link
Contributor Author

/run-check-dev-2

1 similar comment
@MoCuishle28
Copy link
Contributor Author

/run-check-dev-2

@MoCuishle28
Copy link
Contributor Author

/run-unit-test

@MoCuishle28
Copy link
Contributor Author

/run-check-dev-2

@MoCuishle28
Copy link
Contributor Author

/run-check-dev-2
/run-unit-test

@MoCuishle28
Copy link
Contributor Author

/run-check-dev-2

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 22, 2022
@ti-chi-bot ti-chi-bot removed status/can-merge Indicates a PR has been approved by a committer. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 22, 2022
@MoCuishle28
debug
6564b1c 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@MoCuishle28
test
64c4f25 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@MoCuishle28
br: modify newCollationEnabled according to the config of the cluster
39c8a08 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@MoCuishle28
br: modify newCollationEnabled according to the config of the cluster
71c8846 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@MoCuishle28
br: modify newCollationEnabled according to the config of the cluster
d4b0369 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@MoCuishle28
br: modify newCollationEnabled according to the config of the cluster
40e3788 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 40e3788

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 22, 2022
@ti-chi-bot ti-chi-bot merged commit 84703ef into pingcap:master Nov 22, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 22, 2022
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #39319.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Nov 22, 2022
@MoCuishle28 @ti-chi-bot
This is an automated cherry-pick of pingcap#39173
4c09f2e 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@sre-bot
Copy link
Contributor

sre-bot commented Nov 22, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/mybatis-test 🔴 failed 1, success 0, total 1 11 min Existing failure
idc-jenkins-ci/integration-cdc-test ✅ all 39 tests passed 20 min Fixed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 19 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 10 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 7 min 5 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 56 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 5 min 4 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 25 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 44 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

ti-chi-bot added a commit that referenced this pull request Nov 25, 2022
@ti-chi-bot
br: modify collate.newCollationEnabled according to the config of the…
6a99800 
… cluster (#39173) (#39319)

close #39150
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer 3pointer approved these changes

@WangLe1321 WangLe1321 WangLe1321 approved these changes

@YuJuncen YuJuncen YuJuncen approved these changes

Assignees
No one assigned
Labels
component/br This issue is related to BR of TiDB. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 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.

Restore meet error: Unsupported collation when new collation is enabled: 'utf8mb4_0900_ai_ci'
6 participants
@MoCuishle28 @ti-chi-bot @3pointer @sre-bot @WangLe1321 @YuJuncen