Update compatibility of BR (#5905) by ti-srebot · Pull Request #5968 · pingcap/docs-cn

ti-srebot · 2021-04-07T03:11:02Z

cherry-pick #5905 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In docs-cn repo:
git pr https://github.com/pingcap/docs-cn/pull/5968

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

git push git@github.com:ti-srebot/docs-cn.git pr/5968:release-4.0-0b851ba263a9

update compatibility of BR

First-time contributors' checklist

I've signed Contributor License Agreement that's required for repo owners to accept my contribution.

What is changed, added or deleted? (Required)

After introducing clustered index in 5.0, there are some new compatibility problems of BR.

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

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot · 2021-04-07T03:11:12Z

@YuJuncen please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/docs-cn/invitations

TomShawn · 2021-04-07T03:12:14Z

/ho;d

TomShawn · 2021-04-07T03:12:22Z

/hold

YuJuncen · 2021-04-08T05:53:07Z

Sorry, we couldn't find that repository invitation. It is possible that the invitation was revoked or that you are not logged into the invited account.

Well, what should I do... (Maybe make another PR? Or can we just regenerate this invite link?)

YuJuncen · 2021-04-09T02:59:46Z

/cherry-pick-invite

TomShawn · 2021-04-09T03:00:21Z

Sorry, we couldn't find that repository invitation. It is possible that the invitation was revoked or that you are not logged into the invited account.

Well, what should I do... (Maybe make another PR? Or can we just regenerate this invite link?)

Because #5802 is still pending. @3pointer has not decided whether to cherry-pick this content to v4.0.

YuJuncen · 2021-04-09T03:02:07Z

@TomShawn Got it, let's keep holding this.

YuJuncen · 2021-04-09T03:24:47Z

/cherry-pick-invite

🤯

zhouqiang-cl · 2021-04-09T03:55:05Z

/cherry-pick-invite

ti-srebot · 2021-04-09T03:55:09Z

@zhouqiang-cl please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/docs-cn/invitations

YuJuncen · 2021-04-09T04:06:38Z

/cherry-pick-invite

ti-srebot · 2021-04-09T04:06:41Z

@YuJuncen please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/docs-cn/invitations

TomShawn · 2021-04-09T06:22:19Z

+
+| 功能 | 相关 issue | 解决方式 |
+|  ----  | ----  | ----- |
+| 聚簇索引 | [#565](https://github.com/pingcap/br/issues/565)       | 确保备份时 tidb_enable_clustered_index 全局变量和恢复时一致，否则会导致数据不一致的问题，例如 `default not found` 和数据索引不一致。 |


Please remove v5.0-releated content in this PR.

TomShawn · 2021-04-09T06:23:12Z

+| 备份版本（纵向） \ 恢复版本（横向） | BR nightly / TiDB nightly | BR v5.0 / TiDB v5.0| BR v4.0 / TiDB v4.0 |
+|  ----  |  ----  | ---- | ---- |
+| **BR nightly / TiDB nightly** | ✅ | ✅ | ✅ |
+| **BR v5.0 / TiDB v5.0** | ✅ | ✅ | ✅
+| **BR v4.0 / TiDB v4.0** | ❌（如果恢复了使用非整数类型聚簇主键的表到 v4.0 的 TiDB 集群，BR 会无任何警告地导致数据错误） | ❌（如果恢复了使用非整数类型聚簇主键的表到 v4.0 的 TiDB 集群，BR 会无任何警告地导致数据错误） | ✅（如果 TiKV >= v4.0.0-rc.1，BR 包含 [#233](https://github.com/pingcap/br/pull/233) Bug 修复，且 TiKV 不包含 [#7241](https://github.com/tikv/tikv/pull/7241) Bug 修复，那么 BR 会导致 TiKV 节点重启) |
+| **BR nightly 或 v5.0 / TiDB v4.0** | ❌（当 TiDB < v4.0.9 时会出现 [#609](https://github.com/pingcap/br/issues/609) 问题) | ❌（当 TiDB < v4.0.9 会出现 [#609](https://github.com/pingcap/br/issues/609) 问题) | ❌（当 TiDB < v4.0.9 会出现 [#609](https://github.com/pingcap/br/issues/609) 问题) |


Please remove the v5.0-related content.

I think those can be reserved, because the user of v4.0 can also use v5.0 clusters, and wondering the compatibility between them. 🤔

@overvenus @IANTHEREAL PTAL, thanks~

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>

TomShawn · 2021-04-12T09:24:06Z

/unhold
/lgtm

ti-chi-bot · 2021-04-12T09:24:10Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

TomShawn · 2021-04-12T09:24:23Z

/merge

ti-chi-bot · 2021-04-12T09:24:25Z

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

Details

Commit hash: c8ddd59

cherry pick pingcap#5905 to release-4.0

76ddf48

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request Apr 7, 2021

Update compatibility of BR #5905

Merged

7 tasks

ti-srebot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels Apr 7, 2021

ti-srebot requested review from TomShawn and overvenus April 7, 2021 03:11

ti-srebot assigned YuJuncen Apr 7, 2021

ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 7, 2021

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 7, 2021

*: reslove conflict

a2acf9b

TomShawn reviewed Apr 9, 2021

View reviewed changes

TomShawn mentioned this pull request Apr 9, 2021

br:tidy up the incompatible issues in using BR tools. (#5224) #5802

Closed

11 tasks

YuJuncen added 2 commits April 12, 2021 10:39

br: remove clustered index relative contents

5bc739e

br: use reference to compatibility table

c56d623

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 12, 2021

TomShawn reviewed Apr 12, 2021

View reviewed changes

Comment thread br/backup-and-restore-tool.md Outdated

Comment thread br/backup-and-restore-tool.md Outdated

Apply suggestions from code review

c8ddd59

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>

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 12, 2021

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 12, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 12, 2021

ti-chi-bot merged commit 6ad194d into pingcap:release-4.0 Apr 12, 2021

TomShawn mentioned this pull request Apr 12, 2021

br:tidy up the incompatible issues in using BR tools pingcap/docs#5288

Merged

10 tasks

This was referenced Apr 19, 2021

br:tidy up the incompatible issues in using BR tools (#5288) pingcap/docs#5382

Merged

br:tidy up the incompatible issues in using BR tools (#5288) pingcap/docs#5383

Merged

Conversation

ti-srebot commented Apr 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

First-time contributors' checklist

What is changed, added or deleted? (Required)

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

Uh oh!

ti-srebot commented Apr 7, 2021

Uh oh!

TomShawn commented Apr 7, 2021

Uh oh!

TomShawn commented Apr 7, 2021

Uh oh!

YuJuncen commented Apr 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

YuJuncen commented Apr 9, 2021

Uh oh!

TomShawn commented Apr 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

YuJuncen commented Apr 9, 2021

Uh oh!

YuJuncen commented Apr 9, 2021

Uh oh!

zhouqiang-cl commented Apr 9, 2021

Uh oh!

ti-srebot commented Apr 9, 2021

Uh oh!

YuJuncen commented Apr 9, 2021

Uh oh!

ti-srebot commented Apr 9, 2021

Uh oh!

TomShawn Apr 9, 2021

Choose a reason for hiding this comment

Uh oh!

TomShawn Apr 9, 2021

Choose a reason for hiding this comment

Uh oh!

YuJuncen Apr 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TomShawn Apr 12, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

TomShawn commented Apr 12, 2021

Uh oh!

ti-chi-bot commented Apr 12, 2021

Uh oh!

TomShawn commented Apr 12, 2021

Uh oh!

ti-chi-bot commented Apr 12, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ti-srebot commented Apr 7, 2021 •

edited

Loading

YuJuncen commented Apr 8, 2021 •

edited

Loading

TomShawn commented Apr 9, 2021 •

edited

Loading

YuJuncen Apr 12, 2021 •

edited

Loading