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

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #39173

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.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Nov 22, 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-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Nov 22, 2022
@ti-chi-bot ti-chi-bot 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/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Nov 22, 2022
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 22, 2022
@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 24, 2022
… cluster

Signed-off-by: MoCuishle28 <zhanggaoming028@gmail.com>
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Nov 25, 2022
@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 25, 2022
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 25, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 25, 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 Nov 25, 2022
@YuJuncen
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 69abddf

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

/run-all-tests

@MoCuishle28
Copy link
Contributor

/run-mysql-test

@3pointer
Copy link
Contributor

/run-check_dev

@MoCuishle28
Copy link
Contributor

/run-mysql-test

@wuhuizuo
Copy link
Contributor

/run-build

@MoCuishle28
Copy link
Contributor

/run-mysql-test

1 similar comment
@Ivy-YinSu
Copy link

/run-mysql-test

@Ivy-YinSu
Copy link

/run-check_dev

@ti-chi-bot
Copy link
Member Author

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

@Ivy-YinSu
Copy link

/run-check_dev

@MoCuishle28
Copy link
Contributor

/run-unit-test

@Ivy-YinSu
Copy link

/run-check_dev
/run-unit-test

@Ivy-YinSu
Copy link

/run-check_dev

@ti-chi-bot ti-chi-bot merged commit 6a99800 into pingcap:release-6.1 Nov 25, 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/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/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants