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.

Sign up for GitHub

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

Jump to bottom

br: add restore to systables #6194

Merged
merged 13 commits into from
Jul 8, 2021
Merged

br: add restore to systables #6194

merged 13 commits into from
Jul 8, 2021

Conversation

YuJuncen
Copy link
Contributor

@YuJuncen YuJuncen commented Apr 30, 2021 •
edited
Loading

First-time contributors' checklist

What is changed, added or deleted? (Required)

Add a document about the ability of backing up / restore system tables provided by pingcap/br#1048.

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)

Please hold for v5.0 and v4.0 until pingcap/br#1048 was bring to those 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 ti-chi-bot added missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 30, 2021
@TomShawn
Copy link
Contributor

/hold
/label needs-cherry-pick-4.0
/label needs-cherry-pick-5.0
/sig migrate docs
/cc @kennytm @3pointer @overvenus
/assign @Liuxiaozhen12

@ti-chi-bot ti-chi-bot added area/migrate Indicates that the Issue or PR belongs to the area of TiDB migration tools. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. sig/docs Indicates that the Issue or PR belongs to the docs SIG. labels Apr 30, 2021
@kennytm
Copy link
Contributor

kennytm commented Apr 30, 2021

/lgtm

#6194 (review) should be addressed before merging.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 30, 2021
TomShawn
TomShawn reviewed May 6, 2021
View reviewed changes
br/use-br-command-line-tool.md Outdated Show resolved Hide resolved
br/use-br-command-line-tool.md Outdated Show resolved Hide resolved
br/use-br-command-line-tool.md Outdated
Comment on lines 390 to 393
# ^ ^ ^
# | | +- ……仅恢复 `mysql`.`usertable`。
# | +- ……但是过滤掉 `mysql` 中的其它表……
# +- 恢复所有表……
Copy link
Contributor

Choose a reason for hiding this comment

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

能否将注释拿出来单独描述？这里使用了三个 -f，如果不能在一条命令中同时指定，是否需要写三个命令来分开说明呢？

Copy link
Contributor

Choose a reason for hiding this comment

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

@3pointer PTAL, thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

这里的三个 -f 应该是要在一条命令中同时指定的，稍后我处理一下这个……

br/use-br-command-line-tool.md Outdated Show resolved Hide resolved
br/use-br-command-line-tool.md Outdated Show resolved Hide resolved
br/use-br-command-line-tool.md Outdated Show resolved Hide resolved
@YuJuncen @TomShawn
Apply suggestions from code review
36b80ac 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels May 28, 2021
@ti-chi-bot ti-chi-bot removed the missing-translation-status This PR does not have translation status info. label May 28, 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 Jul 8, 2021
TomShawn
TomShawn approved these changes Jul 8, 2021
View reviewed changes
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
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn
  • kennytm

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 8, 2021
@TomShawn
Copy link
Contributor

TomShawn commented Jul 8, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f5ebcf1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 8, 2021
@ti-chi-bot ti-chi-bot merged commit 2214e51 into pingcap:master Jul 8, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 8, 2021
Merged
11 tasks
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Jul 8, 2021
Merged
11 tasks
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Jul 8, 2021
Merged
11 tasks
ti-chi-bot added a commit that referenced this pull request Jul 8, 2021
@ti-chi-bot
br: add restore to systables (#6194) (#6644)
7ec8e1f
ti-chi-bot added a commit that referenced this pull request Jul 8, 2021
@ti-chi-bot
br: add restore to systables (#6194) (#6645)
58b2652
ti-chi-bot added a commit that referenced this pull request Jul 8, 2021
@ti-chi-bot
br: add restore to systables (#6194) (#6646)
fe36f82
@Liuxiaozhen12 Liuxiaozhen12 mentioned this pull request Jul 20, 2021
Merged
12 tasks
@Liuxiaozhen12 Liuxiaozhen12 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 Jul 20, 2021
3AceShowHand pushed a commit to 3AceShowHand/docs-cn that referenced this pull request Jul 27, 2021
@YuJuncen @3AceShowHand
br: add restore to systables (pingcap#6194)
956eb57
This was referenced Aug 26, 2021
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SunRunAway SunRunAway SunRunAway left review comments

@kennytm kennytm kennytm left review comments

@TomShawn TomShawn TomShawn approved these changes

@3pointer 3pointer Awaiting requested review from 3pointer

@overvenus overvenus Awaiting requested review from overvenus

Assignees

@Liuxiaozhen12 Liuxiaozhen12

Labels
area/migrate Indicates that the Issue or PR belongs to the area of TiDB migration tools. sig/docs Indicates that the Issue or PR belongs to the docs SIG. 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/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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@YuJuncen @TomShawn @kennytm @ti-chi-bot @SunRunAway @Liuxiaozhen12