Skip to content

docs: update rereject leader docs#6873

Merged
ti-chi-bot merged 9 commits into
pingcap:masterfrom
nolouch:remove-reject-leader
Aug 17, 2021
Merged

docs: update rereject leader docs#6873
ti-chi-bot merged 9 commits into
pingcap:masterfrom
nolouch:remove-reject-leader

Conversation

@nolouch
Copy link
Copy Markdown
Member

@nolouch nolouch commented Aug 16, 2021

Signed-off-by: nolouch nolouch@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)
  • v5.1 (TiDB 5.1 versions)
  • 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)

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

@nolouch
docs: update rereject leader docs
d4e8a0c 
Signed-off-by: nolouch <nolouch@gmail.com>
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Aug 16, 2021 •
edited
Loading

[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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot requested a review from TomShawn August 16, 2021 11:34
@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 Aug 16, 2021
@nolouch
fix
cb4f1cd 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch nolouch requested a review from rleungx August 16, 2021 11:37
@nolouch
fix
e4a3bc4 
Signed-off-by: nolouch <nolouch@gmail.com>
@qiancai qiancai added the v5.2 This PR/issue applies to TiDB v5.2. label Aug 16, 2021
rleungx
rleungx reviewed Aug 17, 2021
View reviewed changes
Comment thread multi-data-centers-in-one-city-deployment.md Outdated
```

> **注意**
> 5.2 以上版本已不支持，请使用 [Placement Rules](/configure-placement-rules.md) 替代该功能。
Copy link
Copy Markdown
Member

@rleungx rleungx Aug 17, 2021

Choose a reason for hiding this comment

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

I think we still support it but the label-scheduler is not added by default.

Copy link
Copy Markdown
Contributor

@TomShawn TomShawn Aug 17, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
> 5.2 以上版本已不支持，请使用 [Placement Rules](/configure-placement-rules.md) 替代该功能。
> TiDB 5.2 及以上版本不支持通过以上模板设置调度策略。若要设置调度策略，请使用 [Placement Rules](/configure-placement-rules.md)。

TomShawn
TomShawn reviewed Aug 17, 2021
View reviewed changes
Comment thread config-templates/geo-redundancy-deployment.yaml Outdated
TomShawn
TomShawn reviewed Aug 17, 2021
View reviewed changes
Comment thread geo-distributed-deployment-topology.md Outdated
TomShawn
TomShawn reviewed Aug 17, 2021
View reviewed changes
Comment thread three-data-centers-in-two-cities-deployment.md Outdated
@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. and removed missing-translation-status This PR does not have translation status info. labels Aug 17, 2021
@nolouch @TomShawn
Update config-templates/geo-redundancy-deployment.yaml
23e8c6e 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
TomShawn
TomShawn reviewed Aug 17, 2021
View reviewed changes
Comment thread geo-distributed-deployment-topology.md Outdated
Comment thread multi-data-centers-in-one-city-deployment.md Outdated
Comment thread three-data-centers-in-two-cities-deployment.md Outdated
@nolouch
address comment
04fcdec 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch nolouch force-pushed the remove-reject-leader branch from 8dc5905 to 04fcdec Compare August 17, 2021 06:43
TomShawn
TomShawn reviewed Aug 17, 2021
View reviewed changes
Comment thread config-templates/geo-redundancy-deployment.yaml Outdated
nolouch and others added 4 commits August 17, 2021 15:01
@nolouch @TomShawn
Update geo-distributed-deployment-topology.md
1ad271a 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@nolouch @TomShawn
Update config-templates/geo-redundancy-deployment.yaml
6b5e182 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@nolouch @TomShawn
Update three-data-centers-in-two-cities-deployment.md
9c24556 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@nolouch @TomShawn
Update multi-data-centers-in-one-city-deployment.md
64cca7b 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
TomShawn
TomShawn approved these changes Aug 17, 2021
View reviewed changes
Copy link
Copy Markdown
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 Aug 17, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Aug 17, 2021

/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 Aug 17, 2021
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Aug 17, 2021

@rleungx: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

Details

In response to this:

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.

@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Aug 17, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Aug 17, 2021

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

DetailsCommit hash: 64cca7b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 17, 2021
@ti-chi-bot ti-chi-bot merged commit ba43e05 into pingcap:master Aug 17, 2021
@nolouch nolouch deleted the remove-reject-leader branch August 17, 2021 07:12
@en-jin19 en-jin19 mentioned this pull request Aug 17, 2021
Merged
11 tasks
@en-jin19 en-jin19 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 Aug 17, 2021
@TomShawn TomShawn added the type/enhancement The issue or PR belongs to an enhancement. label Aug 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rleungx rleungx rleungx approved these changes

+1 more reviewer

@TomShawn TomShawn TomShawn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@en-jin19 en-jin19

Labels

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. type/enhancement The issue or PR belongs to an enhancement. v5.2 This PR/issue applies to TiDB v5.2.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@nolouch @ti-chi-bot @TomShawn @rleungx @en-jin19 @qiancai