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:tidy up the incompatible issues in using BR tools. #5224

Merged
merged 19 commits into from
Mar 23, 2021

Conversation

3pointer
Copy link
Contributor

First-time contributors' checklist

What is changed, added or deleted? (Required)

Tidy up the incompatible issues in using BR tools.

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

  • master (the latest development version)
  • 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

@3pointer 3pointer changed the title br: add incompatible issue br:tidy up the incompatible issues in using BR tools. Dec 31, 2020
@TomShawn TomShawn requested a review from overvenus December 31, 2020 08:29
@TomShawn TomShawn self-assigned this Dec 31, 2020
@TomShawn TomShawn added needs-cherry-pick-4.0 size/large Changes of a large size. translation/doing This PR’s assignee is translating this PR. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Dec 31, 2020
Copy link
Member

@overvenus overvenus left a comment

Choose a reason for hiding this comment

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

Could you inline backup-and-restore-incompatible.md into the section ## 兼容性?

@3pointer
Copy link
Contributor Author

3pointer commented Mar 2, 2021

Could you inline backup-and-restore-incompatible.md into the section ## 兼容性?

Done, PTAL again

@3pointer
Copy link
Contributor Author

3pointer commented Mar 2, 2021

/rebuild

@3pointer
Copy link
Contributor Author

3pointer commented Mar 2, 2021

tiup/tiup-dm-topology-reference.md
	ERROR	https://github.com/pingcap/tiup/blob/master/examples/dm/topology.example.yaml
		Not Found (HTTP error 404)

it seems irrelevant 🤔️

Copy link
Member

@overvenus overvenus 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-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 3, 2021
br/backup-and-restore-tool.md Outdated Show resolved Hide resolved
Comment on lines 74 to 75
Cluster Index | [#565](https://github.com/pingcap/br/issues/565) | 确保备份时 cluster_index 和恢复时一致,否则会导致数据不一致的问题,如 default not found, 数据索引不一致。
New collation | [#352](https://github.com/pingcap/br/issues/352) | 确保备份时集群 new_collation 和恢复时一致,否则会导致数据索引不一致,checksum 不通过。
Copy link
Contributor

Choose a reason for hiding this comment

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

  • 如果 BR 和聚簇索引/ New collation 不兼容,为什么会有 "备份时 cluster_index /New collation 和恢复时一致”呢?似乎是说已经使用了这两个不兼容的功能,但不需要禁用?感觉有些困惑。
  • Cluster Index --> Clustered Index 或 聚簇索引
  • New collation 不等于 new_collation 吗?

| ---- | ---- | ----- |
Cluster Index | [#565](https://github.com/pingcap/br/issues/565) | 确保备份时 cluster_index 和恢复时一致,否则会导致数据不一致的问题,如 default not found, 数据索引不一致。
New collation | [#352](https://github.com/pingcap/br/issues/352) | 确保备份时集群 new_collation 和恢复时一致,否则会导致数据索引不一致,checksum 不通过。
恢复集群开启 CDC 同步 | [#364](https://github.com/pingcap/br/issues/364#issuecomment-646813965) | BR ingest 的 SST 文件, TiKV 还没实现下推到 CDC,因此使用 BR 恢复时候需要关闭 CDC。
Copy link
Contributor

Choose a reason for hiding this comment

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

CDC --> TiCDC

New collation | [#352](https://github.com/pingcap/br/issues/352) | 确保备份时集群 new_collation 和恢复时一致,否则会导致数据索引不一致,checksum 不通过。
恢复集群开启 CDC 同步 | [#364](https://github.com/pingcap/br/issues/364#issuecomment-646813965) | BR ingest 的 SST 文件, TiKV 还没实现下推到 CDC,因此使用 BR 恢复时候需要关闭 CDC。

在上述 feature 确保兼容的**前提**下,BR 和 TiKV/TiDB/PD 还可能因为版本内部协议不一致/接口不一致出现不兼容的问题,因此 BR 内置了版本检查。
Copy link
Contributor

Choose a reason for hiding this comment

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

在上述 feature 确保兼容的前提下,但上面三个 feature 似乎是不兼容的。这里写感觉有些前后矛盾。

br/backup-and-restore-tool.md Outdated Show resolved Hide resolved
### 版本检查

BR 内置版本检查会在执行前,对集群版本和自身版本进行对比检查,如果大版本对不上(比如 BR 4.x 用在 TiDB 5.x 上), 那么会提示退出。但是可以通过设置 `--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.

需要简单介绍一下下表是什么。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

这里描述的是 BR 版本和 TiDB集群版本兼容信息整理

Copy link
Contributor Author

Choose a reason for hiding this comment

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

这里有描述
`BR 内置版本会在执行备份和恢复操作前,对 TiDB 集群版本和自身版本进行对比检查

BR 内置版本检查会在执行前,对集群版本和自身版本进行对比检查,如果大版本对不上(比如 BR 4.x 用在 TiDB 5.x 上), 那么会提示退出。但是可以通过设置 `--check-requirements=false` 强行跳过版本检查。
需要注意的是,跳过检查可能会遇到版本不兼容的问题,现整理如下:

| 备份 \ 恢复| BR nightly / TiDB nightly| BR 5.0 / TiDB 5.0| BR 4.0 / TiDB 4.0 |
Copy link
Contributor

Choose a reason for hiding this comment

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

能否解释下表头(首行)和首列各代表什么?
image 当前我无法看出是什么含义。

| ---- | ---- | ---- | ---- |
**BR nightly / TiDB nightly** | ✅ | ✅ | ✅ |
**BR 5.0 / TiDB 5.0** | ✅ | ✅ | ✅
**BR 4.0 / TiDB 4.0** | ✅ | ✅ | ✅(TiKV>=4.0.0-rc.1(BR [#233](https://github.com/pingcap/br/pull/233) and TiKV not include [#7241](https://github.com/tikv/tikv/pull/7241)), BR will panic TiKV) |
Copy link
Contributor

Choose a reason for hiding this comment

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

中文文档请尽量使用中文叙述。

@TomShawn TomShawn added the status/require-change Needs the author to address comments. label Mar 9, 2021
@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 Mar 23, 2021
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.

Global comment: BR 4.0 或 5.0 --> BR v4.0 或 v5.0,TiDB 4.0 或 5.0 相同

br/backup-and-restore-tool.md Outdated Show resolved Hide resolved
br/backup-and-restore-tool.md Outdated Show resolved Hide resolved
br/backup-and-restore-tool.md Outdated Show resolved Hide resolved
br/backup-and-restore-tool.md Outdated Show resolved Hide resolved
br/backup-and-restore-tool.md Outdated Show resolved Hide resolved
br/backup-and-restore-tool.md Outdated Show resolved Hide resolved
br/backup-and-restore-tool.md Outdated Show resolved Hide resolved
@TomShawn
Copy link
Contributor

/label require-LGT1

@ti-chi-bot ti-chi-bot added the require-LGT1 Indicates that the PR requires an LGTM. label Mar 23, 2021
@TomShawn
Copy link
Contributor

/lgtm

@TomShawn
Copy link
Contributor

/remove-status require-change

@ti-chi-bot ti-chi-bot removed the status/require-change Needs the author to address comments. label Mar 23, 2021
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 169f3e3

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 23, 2021
@ti-chi-bot ti-chi-bot merged commit d01e2d3 into pingcap:master Mar 23, 2021
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Mar 23, 2021
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #5802

ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Mar 23, 2021
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #5803

@TomShawn
Copy link
Contributor

/remove-translation doing
/translation done

@ti-chi-bot ti-chi-bot 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 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
require-LGT1 Indicates that the PR requires an LGTM. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. 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/LGT1 Indicates that a PR has LGTM 1. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants