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: refine BR docs #8628

Merged
merged 39 commits into from Jun 29, 2022
Merged

BR: refine BR docs #8628

merged 39 commits into from Jun 29, 2022

Conversation

shichun-0415
Copy link
Contributor

@shichun-0415 shichun-0415 commented May 13, 2022

First-time contributors' checklist

What is changed, added or deleted? (Required)

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

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.

  • master (the latest development version)
  • v6.1 (TiDB 6.1 versions)
  • 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)

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
Copy link
Member

ti-chi-bot commented May 13, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn
  • hfxsd

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 the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 13, 2022
@ti-chi-bot ti-chi-bot requested a review from TomShawn May 13, 2022 13:11
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 13, 2022
@shichun-0415 shichun-0415 added type/refactor Reorganizes the documentation structure. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. area/br Indicates that the Issue or PR belongs to the area of BR (Backup & Restore). size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed missing-translation-status This PR does not have translation status info. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 13, 2022
@shichun-0415 shichun-0415 removed the request for review from TomShawn May 13, 2022 13:12
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 16, 2022
@shichun-0415 shichun-0415 force-pushed the refine-BR branch 2 times, most recently from cef9e4b to 1612bb1 Compare May 17, 2022 09:26
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 17, 2022
@shichun-0415 shichun-0415 changed the title [WIP] refine BR-part 1 BR: refine BR docs Jun 1, 2022
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 1, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 28, 2022
shichun-0415 and others added 3 commits June 28, 2022 16:15
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Copy link
Collaborator

@hfxsd hfxsd 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 Jun 28, 2022
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>

If a backup operation fails and the preceding message occurs, perform one of the following operations and then start the backup again:

- Change the directory for the backup. For example, change `/dir/backup-2020-01-01/` to `/dir/backup_local/`.
Copy link
Contributor

Choose a reason for hiding this comment

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

change /dir/backup_local/ to /dir/backup-2020-01-01/?

Copy link
Contributor

@IANTHEREAL IANTHEREAL left a comment

Choose a reason for hiding this comment

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

Rest LGTM

@shichun-0415
Copy link
Contributor Author

/merge

1 similar comment
@shichun-0415
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 723d507

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 29, 2022
@ti-chi-bot ti-chi-bot merged commit b4600d8 into pingcap:master Jun 29, 2022
ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Jun 29, 2022
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 29, 2022
14 tasks
@ti-chi-bot
Copy link
Member

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

@shichun-0415 shichun-0415 deleted the refine-BR branch June 29, 2022 12:07
ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Jun 29, 2022
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 29, 2022
14 tasks
@ti-chi-bot
Copy link
Member

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

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). needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. size/XXL Denotes a PR that changes 1000+ 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/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. type/refactor Reorganizes the documentation structure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants