Skip to content

improve location-awareness#3825

Merged
TomShawn merged 29 commits into
pingcap:masterfrom
ireneontheway:update-location-awareness
Sep 17, 2020
Merged

improve location-awareness#3825
TomShawn merged 29 commits into
pingcap:masterfrom
ireneontheway:update-location-awareness

Conversation

@ireneontheway
Copy link
Copy Markdown
Contributor

@ireneontheway ireneontheway commented Sep 4, 2020 •
edited by TomShawn
Loading

What is changed, added or deleted? (Required)

Improve location-awareness document.

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

  • master (the latest development version)
  • 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)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Have version specific changes
  • Might cause conflicts

@ireneontheway ireneontheway added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. size/large Changes of a large size. needs-cherry-pick-2.1 status/PTAL This PR is ready for reviewing. labels Sep 4, 2020
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Sep 6, 2020

@disksing, @yikeke, PTAL.

@yikeke yikeke requested a review from TomShawn September 7, 2020 08:13
@yikeke
Copy link
Copy Markdown
Contributor

yikeke commented Sep 7, 2020 •
edited
Loading

Please help review this PR. @TomShawn

Before you merge or cherry-pick this PR, note that there are two more issues that need follow-up. @ireneontheway @TomShawn

TomShawn
TomShawn suggested changes Sep 7, 2020
View reviewed changes
Comment thread schedule-replicas-by-topology-labels.md Outdated
Comment thread schedule-replicas-by-topology-labels.md Outdated
@yikeke yikeke removed their request for review September 7, 2020 08:18
TomShawn
TomShawn reviewed Sep 7, 2020
View reviewed changes
Comment thread TOC.md Outdated
disksing
disksing reviewed Sep 7, 2020
View reviewed changes
Comment thread schedule-replicas-by-topology-labels.md Outdated
Comment thread schedule-replicas-by-topology-labels.md Outdated
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Sep 7, 2020

Please help review this PR. @TomShawn

Please note that there are two more issues that need follow-up. @ireneontheway @TomShawn

Got it, thanks~

ireneontheway
ireneontheway commented Sep 7, 2020
View reviewed changes
Comment thread schedule-replicas-by-topology-labels.md Outdated
ireneontheway
ireneontheway commented Sep 7, 2020
View reviewed changes
Comment thread schedule-replicas-by-topology-labels.md Outdated
ireneontheway
ireneontheway commented Sep 7, 2020
View reviewed changes
Comment thread schedule-replicas-by-topology-labels.md Outdated
ireneontheway
ireneontheway commented Sep 7, 2020
View reviewed changes
Comment thread schedule-replicas-by-topology-labels.md Outdated
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Sep 16, 2020

@TomShawn, @disksing, PTAL.

@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Sep 16, 2020

@ireneontheway, please update your pull request.

TomShawn
TomShawn reviewed Sep 16, 2020
View reviewed changes
Comment thread schedule-replicas-by-topology-labels.md
> **Note:**
>
> `isolation-level` is empty by default, which means there is no mandatory restriction on the isolation level. To set it, you need to configure `location-labels` for PD and ensure that the value of `isolation-level` is one of `location-labels` names.

Copy link
Copy Markdown
Contributor

@TomShawn TomShawn Sep 16, 2020

Choose a reason for hiding this comment

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

@ireneontheway Please align pingcap/docs-cn#4502 in this document, thanks!

Copy link
Copy Markdown
Contributor Author

@ireneontheway ireneontheway Sep 17, 2020

Choose a reason for hiding this comment

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

Done in dbd5321

TomShawn
TomShawn approved these changes Sep 17, 2020
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-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 17, 2020
@TomShawn TomShawn merged commit 24f31fb into pingcap:master Sep 17, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Sep 17, 2020
@ireneontheway @ti-srebot
cherry pick pingcap#3825 to release-2.1
0ad389a 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 17, 2020
Merged
9 tasks
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Sep 17, 2020

cherry pick to release-2.1 in PR #3927

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Sep 17, 2020
@ireneontheway @ti-srebot
cherry pick pingcap#3825 to release-3.0
1e45d7c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 17, 2020
Merged
9 tasks
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Sep 17, 2020

cherry pick to release-3.0 in PR #3928

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Sep 17, 2020
@ireneontheway @ti-srebot
cherry pick pingcap#3825 to release-3.1
42cb262 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 17, 2020
Merged
9 tasks
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Sep 17, 2020

cherry pick to release-3.1 in PR #3929

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Sep 17, 2020
@ireneontheway @ti-srebot
cherry pick pingcap#3825 to release-4.0
69f56b3 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 17, 2020
Merged
9 tasks
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Sep 17, 2020

cherry pick to release-4.0 in PR #3930

TomShawn added a commit that referenced this pull request Sep 17, 2020
@ti-srebot @ireneontheway @TomShawn
improve location-awareness (#3825) (#3927)
8def815 
* cherry pick #3825 to release-2.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* 2.1-changes

Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
TomShawn added a commit that referenced this pull request Sep 17, 2020
@ti-srebot @ireneontheway @TomShawn
improve location-awareness (#3825) (#3928)
0a6570f 
* cherry pick #3825 to release-3.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* 3.0-changes

Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
TomShawn added a commit that referenced this pull request Sep 17, 2020
@ti-srebot @ireneontheway @TomShawn
improve location-awareness (#3825) (#3929)
b891133 
* cherry pick #3825 to release-3.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* 3.1-change

* Update configure-placement-rules.md

* Update schedule-replicas-by-topology-labels.md

* Update schedule-replicas-by-topology-labels.md

Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
TomShawn added a commit that referenced this pull request Sep 17, 2020
@ti-srebot @ireneontheway @TomShawn
improve location-awareness (#3825) (#3930)
002da12 
* cherry pick #3825 to release-4.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* 4.0-change

Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@ireneontheway ireneontheway deleted the update-location-awareness branch September 17, 2020 06:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@disksing disksing disksing approved these changes

+1 more reviewer

@TomShawn TomShawn TomShawn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/large Changes of a large size. status/LGT1 Indicates that a PR has LGTM 1. status/require-change Needs the author to address comments. 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.

5 participants

@ireneontheway @ti-srebot @yikeke @TomShawn @disksing