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

Add store cancel-delete command in pd-ctl #9595

Merged
merged 4 commits into from
May 26, 2022

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented May 26, 2022

Signed-off-by: Ryan Leung rleungx@gmail.com

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 (in Chinese).

  • 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)?

  • 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

@rleungx rleungx requested a review from nolouch May 26, 2022 04:07
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 26, 2022

[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.

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 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 May 26, 2022
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@TomShawn TomShawn self-assigned this May 26, 2022
@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. area/scheduling Indicates that the Issue or PR belongs to the area of scheduling. v6.1 This PR/issue applies to TiDB v6.1. and removed missing-translation-status This PR does not have translation status info. labels May 26, 2022
pd-control.md Outdated
@@ -1251,9 +1251,17 @@ Encoding 格式示例:
>> store delete 1
```

撤销使用 store delete 下线的 store,如撤销下线 store id 为 1 的 store:
Copy link
Member

Choose a reason for hiding this comment

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

需要说明一下 tombstone 是没法 cancel 的?或者只有处于 Offline 的状态才行?

Copy link
Member Author

Choose a reason for hiding this comment

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

ok

Signed-off-by: Ryan Leung <rleungx@gmail.com>
@TomShawn TomShawn requested a review from nolouch May 26, 2022 07:07
pd-control.md Outdated Show resolved Hide resolved
pd-control.md Outdated Show resolved Hide resolved
rleungx and others added 2 commits May 26, 2022 15:47
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
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 ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 26, 2022
@TomShawn
Copy link
Contributor

/remove-status LGT1
/status LGT2

@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 May 26, 2022
@TomShawn
Copy link
Contributor

1+1

@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 7373f71

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 26, 2022
@ti-chi-bot ti-chi-bot merged commit d0e47e0 into pingcap:master May 26, 2022
@rleungx rleungx deleted the add-cancel branch May 26, 2022 08:08
@TomShawn TomShawn 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 May 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/scheduling Indicates that the Issue or PR belongs to the area of scheduling. size/S Denotes a PR that changes 10-29 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. v6.1 This PR/issue applies to TiDB v6.1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants