Skip to content

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

Merged
ti-chi-bot merged 6 commits into
pingcap:masterfrom
TomShawn:br-compatibility-versions
Apr 19, 2021
Merged

br:tidy up the incompatible issues in using BR tools#5288
ti-chi-bot merged 6 commits into
pingcap:masterfrom
TomShawn:br-compatibility-versions

Conversation

@TomShawn
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn commented Apr 12, 2021 •
edited
Loading

What is changed, added or deleted? (Required)

  • Tidy up the incompatible issues in using BR tools.
  • update minimum BR requirements

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) version specific changes Update compatibility of BR (#5905) docs-cn#5968
  • 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)?

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 ti-chi-bot added missing-translation-status This PR does not have translation status info. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 12, 2021
@TomShawn
Copy link
Copy Markdown
Contributor Author

TomShawn commented Apr 12, 2021

/label needs-cherry-pick-5.0
/label needs-cherry-pick-4.0
/translation from-docs-cn
/label requires-version-specific-changes
/label require-LGT1
/cc @yikeke @overvenus @YuJuncen @3pointer

@ti-chi-bot ti-chi-bot added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. needs-cherry-pick-5.0 requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. require-LGT1 Indicates that the PR requires an LGTM. and removed missing-translation-status This PR does not have translation status info. labels Apr 12, 2021
@yikeke yikeke requested review from lilin90 and removed request for yikeke April 13, 2021 09:16
TomShawn
TomShawn commented Apr 13, 2021
View reviewed changes
Comment thread br/backup-and-restore-tool.md Outdated
lilin90
lilin90 reviewed Apr 14, 2021
View reviewed changes
Comment thread br/backup-and-restore-tool.md Outdated
Comment thread br/backup-and-restore-tool.md Outdated
Comment thread br/backup-and-restore-tool.md Outdated
Comment thread br/backup-and-restore-tool.md

However, even after you have ensured that the above features are consistently enabled or disabled during backup and restore, compatibility issues might still occur due to the inconsistent internal versions or inconsistent interfaces between BR and TiKV/TiDB/PD. To avoid such cases, BR have the built-in version check.

#### Version check
Copy link
Copy Markdown
Member

@lilin90 lilin90 Apr 14, 2021

Choose a reason for hiding this comment

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

In the Chinese version, the heading of this section is at the same level with Compatibility. But it seems that the BR version check is also one type of compatibility issues. What do you think?

Copy link
Copy Markdown
Contributor Author

@TomShawn TomShawn Apr 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I think so. The Chinese version is updated in pingcap/docs-cn#6047.

TomShawn and others added 2 commits April 16, 2021 10:54
@TomShawn @lilin90
Apply suggestions from code review
4e9d357 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@TomShawn @lilin90
Update br/backup-and-restore-tool.md
25cc992 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@lilin90
Copy link
Copy Markdown
Member

lilin90 commented Apr 19, 2021

/lgtm

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Apr 19, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lilin90

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.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 19, 2021
@YuJuncen
Copy link
Copy Markdown
Contributor

YuJuncen commented Apr 19, 2021

/lgtm

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Apr 19, 2021

@YuJuncen: /lgtm is only allowed for the reviewers in list.

Details

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.

@3pointer
Copy link
Copy Markdown
Contributor

3pointer commented Apr 19, 2021

/lgtm

@TomShawn
Copy link
Copy Markdown
Contributor Author

TomShawn commented Apr 19, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Apr 19, 2021

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

DetailsCommit hash: 25cc992

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 19, 2021
@ti-chi-bot ti-chi-bot merged commit 11882d3 into pingcap:master Apr 19, 2021
@TomShawn TomShawn deleted the br-compatibility-versions branch April 19, 2021 03:29
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Apr 19, 2021
@TomShawn @ti-srebot
cherry pick pingcap#5288 to release-4.0
aff1313 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Apr 19, 2021
Merged
10 tasks
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Apr 19, 2021

cherry pick to release-4.0 in PR #5382

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Apr 19, 2021
@TomShawn @ti-srebot
cherry pick pingcap#5288 to release-5.0
78acdcd 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Apr 19, 2021
Merged
10 tasks
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Apr 19, 2021

cherry pick to release-5.0 in PR #5383

ti-chi-bot pushed a commit that referenced this pull request Apr 19, 2021
@ti-srebot
br:tidy up the incompatible issues in using BR tools (#5288) (#5383)
6927de8
ti-chi-bot pushed a commit that referenced this pull request Apr 19, 2021
@ti-srebot
br:tidy up the incompatible issues in using BR tools (#5288) (#5382)
771edfa
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lilin90 lilin90 lilin90 left review comments

@3pointer 3pointer Awaiting requested review from 3pointer

@overvenus overvenus Awaiting requested review from overvenus

@YuJuncen YuJuncen Awaiting requested review from YuJuncen

Assignees

No one assigned

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/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@TomShawn @lilin90 @ti-chi-bot @YuJuncen @3pointer @ti-srebot