Skip to content

Conversation

@joccau
Copy link
Contributor

@joccau joccau commented Mar 31, 2022

Signed-off-by: joccau zak.zhao@pingcap.com

First-time contributors' checklist

What is changed, added or deleted? (Required)

Add comments for 6.0 br compatibility because of the default changing of the config new_collations_enabled_on_first_bootstrap from false to true.

Which TiDB version(s) do your changes apply to? (Required)

6.0

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v6.0 (TiDB 6.0 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 31, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • TomShawn

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.

Details

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 requested a review from TomShawn March 31, 2022 12:40
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 31, 2022
@joccau
Copy link
Contributor Author

joccau commented Mar 31, 2022

/cc @3pointer @IANTHEREAL

@joccau joccau force-pushed the fix-check-collation branch from 143272d to f48114c Compare March 31, 2022 12:47
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau joccau force-pushed the fix-check-collation branch from f48114c to 493ca21 Compare March 31, 2022 14:19
@TomShawn TomShawn self-assigned this Apr 1, 2022
@TomShawn TomShawn added v6.0 This PR/issue applies to TiDB v6.0. and removed missing-translation-status This PR does not have translation status info. labels Apr 1, 2022

从 TiDB v6.0 版本开始,`new_collations_enabled_on_first_bootstrap` 配置的默认值由 `false` 改为 `true`,当上下游集群的此项配置相同时,才可以将上游集群的备份数据安全地恢复到下游集群中。

从 br v6.0 开始,br 会备份上游集群的 `new_collations_enabled_on_first_bootstrap` 配置项,同时在恢复时会检查此配置项是否与下游集群相同。如果用户需要将旧版本的备份数据恢复到 TiDB v6.0 中,用户需要自行检查上下游集群中的此配置项是否相同,若相同,则在恢复命令中添加 `--check-requirements=false` 可跳过此项配置检查。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果上下游的 new_collations_enabled_on_first_bootstrap 配置项不相同会怎样呢?会有什么报错呢?

@TomShawn TomShawn added area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. area/br Indicates that the Issue or PR belongs to the area of BR (Backup & Restore). translation/doing This PR’s assignee is translating this PR. labels Apr 1, 2022
Signed-off-by: joccau <zak.zhao@pingcap.com>
Copy link
Contributor

@3pointer 3pointer 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 Apr 1, 2022
joccau and others added 2 commits April 1, 2022 16:34
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 1, 2022
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@joccau joccau force-pushed the fix-check-collation branch from e9965ac to 3246b18 Compare April 1, 2022 08:48
Copy link
Contributor

@TomShawn TomShawn 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 1, 2022
@TomShawn
Copy link
Contributor

TomShawn commented Apr 1, 2022

/merge

@ti-chi-bot
Copy link
Member

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

DetailsCommit hash: 3246b18

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 1, 2022
@ti-chi-bot ti-chi-bot merged commit 7f22103 into pingcap:master Apr 1, 2022
@ti-chi-bot
Copy link
Member

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

@TomShawn TomShawn added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Apr 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/br Indicates that the Issue or PR belongs to the area of BR (Backup & Restore). area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. size/S Denotes a PR that changes 10-29 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. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. v6.0 This PR/issue applies to TiDB v6.0.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants