From 75b52d187b52cd6ac009e505308cfc3f36abe1ca Mon Sep 17 00:00:00 2001 From: en-jin19 Date: Tue, 17 Aug 2021 12:12:43 +0200 Subject: [PATCH 1/7] docs: update rereject leader docs --- config-templates/geo-redundancy-deployment.yaml | 2 +- geo-distributed-deployment-topology.md | 10 +++++++--- multi-data-centers-in-one-city-deployment.md | 4 ++++ three-data-centers-in-two-cities-deployment.md | 4 ++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/config-templates/geo-redundancy-deployment.yaml b/config-templates/geo-redundancy-deployment.yaml index 6761451067570..c4f795642fe02 100644 --- a/config-templates/geo-redundancy-deployment.yaml +++ b/config-templates/geo-redundancy-deployment.yaml @@ -29,7 +29,7 @@ server_configs: pd: replication.location-labels: ["zone","dc","rack","host"] replication.max-replicas: 5 - label-property: + label-property: `label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/stable/configure-placement-rules.md). reject-leader: - key: "dc" value: "sha" diff --git a/geo-distributed-deployment-topology.md b/geo-distributed-deployment-topology.md index 68e4484968f3a..898a86175ca63 100644 --- a/geo-distributed-deployment-topology.md +++ b/geo-distributed-deployment-topology.md @@ -84,9 +84,13 @@ This section describes the key parameter configuration of the TiDB geo-distribut value: "sha" ``` -> **Note:** + > **Note:** + > + >`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/stable/configure-placement-rules.md). +> +> For the further information about labels and the number of Raft Group replicas, see [Schedule Replicas by Topology Labels](/schedule-replicas-by-topology-labels.md). +> +>**Note:** > > - You do not need to manually create the `tidb` user in the configuration file. The TiUP cluster component automatically creates the `tidb` user on the target machines. You can customize the user, or keep the user consistent with the control machine. > - If you configure the deployment directory as a relative path, the cluster will be deployed in the home directory of the user. - -[Schedule Replicas by Topology Labels](/schedule-replicas-by-topology-labels.md) further explains the use of labels and the number of Raft Group replicas. diff --git a/multi-data-centers-in-one-city-deployment.md b/multi-data-centers-in-one-city-deployment.md index ec19507d81de6..f59bac3363bad 100644 --- a/multi-data-centers-in-one-city-deployment.md +++ b/multi-data-centers-in-one-city-deployment.md @@ -71,6 +71,10 @@ member leader_priority pdName2 4 member leader_priority pdName3 3 ``` +**Note** + +`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/stable/configure-placement-rules.md). + **Disadvantages:** - Write scenarios are still affected by network latency across DCs. This is because Raft follows the majority protocol and all written data must be replicated to at least two DCs. diff --git a/three-data-centers-in-two-cities-deployment.md b/three-data-centers-in-two-cities-deployment.md index 620496c7491b9..370d3406397fb 100644 --- a/three-data-centers-in-two-cities-deployment.md +++ b/three-data-centers-in-two-cities-deployment.md @@ -192,6 +192,10 @@ In the deployment of three DCs in two cities, to optimize performance, you need ```yaml config set label-property reject-leader dc 3 ``` + + > **Note:** + > + >`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/stable/configure-placement-rules.md). - Configure the priority of PD. To avoid the situation where the PD leader is in another city (IDC3), you can increase the priority of local PD (in Seattle) and decrease the priority of PD in another city (San Francisco). The larger the number, the higher the priority. From 6eb671fb9f6c25a75ddf73fcb562d7553b543093 Mon Sep 17 00:00:00 2001 From: en-jin19 Date: Tue, 17 Aug 2021 14:20:58 +0200 Subject: [PATCH 2/7] fix ci errors --- config-templates/geo-redundancy-deployment.yaml | 2 +- geo-distributed-deployment-topology.md | 2 +- multi-data-centers-in-one-city-deployment.md | 2 +- three-data-centers-in-two-cities-deployment.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-templates/geo-redundancy-deployment.yaml b/config-templates/geo-redundancy-deployment.yaml index c4f795642fe02..24fee57571dd4 100644 --- a/config-templates/geo-redundancy-deployment.yaml +++ b/config-templates/geo-redundancy-deployment.yaml @@ -29,7 +29,7 @@ server_configs: pd: replication.location-labels: ["zone","dc","rack","host"] replication.max-replicas: 5 - label-property: `label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/stable/configure-placement-rules.md). + label-property: `label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). reject-leader: - key: "dc" value: "sha" diff --git a/geo-distributed-deployment-topology.md b/geo-distributed-deployment-topology.md index 898a86175ca63..a3803422f1514 100644 --- a/geo-distributed-deployment-topology.md +++ b/geo-distributed-deployment-topology.md @@ -86,7 +86,7 @@ This section describes the key parameter configuration of the TiDB geo-distribut > **Note:** > - >`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/stable/configure-placement-rules.md). + >`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). > > For the further information about labels and the number of Raft Group replicas, see [Schedule Replicas by Topology Labels](/schedule-replicas-by-topology-labels.md). > diff --git a/multi-data-centers-in-one-city-deployment.md b/multi-data-centers-in-one-city-deployment.md index f59bac3363bad..d4dbdcc0080e3 100644 --- a/multi-data-centers-in-one-city-deployment.md +++ b/multi-data-centers-in-one-city-deployment.md @@ -73,7 +73,7 @@ member leader_priority pdName3 3 **Note** -`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/stable/configure-placement-rules.md). +`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). **Disadvantages:** diff --git a/three-data-centers-in-two-cities-deployment.md b/three-data-centers-in-two-cities-deployment.md index 370d3406397fb..3d569b86409b1 100644 --- a/three-data-centers-in-two-cities-deployment.md +++ b/three-data-centers-in-two-cities-deployment.md @@ -195,7 +195,7 @@ In the deployment of three DCs in two cities, to optimize performance, you need > **Note:** > - >`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/stable/configure-placement-rules.md). + >`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). - Configure the priority of PD. To avoid the situation where the PD leader is in another city (IDC3), you can increase the priority of local PD (in Seattle) and decrease the priority of PD in another city (San Francisco). The larger the number, the higher the priority. From d8f4c31942c4241fec7adb5831401f8c0687b8e5 Mon Sep 17 00:00:00 2001 From: en-jin19 Date: Wed, 18 Aug 2021 10:53:08 +0200 Subject: [PATCH 3/7] remove links in the translations --- config-templates/geo-redundancy-deployment.yaml | 2 +- geo-distributed-deployment-topology.md | 4 +--- multi-data-centers-in-one-city-deployment.md | 4 ++-- three-data-centers-in-two-cities-deployment.md | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config-templates/geo-redundancy-deployment.yaml b/config-templates/geo-redundancy-deployment.yaml index 24fee57571dd4..eddf777260365 100644 --- a/config-templates/geo-redundancy-deployment.yaml +++ b/config-templates/geo-redundancy-deployment.yaml @@ -29,7 +29,7 @@ server_configs: pd: replication.location-labels: ["zone","dc","rack","host"] replication.max-replicas: 5 - label-property: `label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). + label-property: Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. reject-leader: - key: "dc" value: "sha" diff --git a/geo-distributed-deployment-topology.md b/geo-distributed-deployment-topology.md index a3803422f1514..4cab9ab9baba0 100644 --- a/geo-distributed-deployment-topology.md +++ b/geo-distributed-deployment-topology.md @@ -86,11 +86,9 @@ This section describes the key parameter configuration of the TiDB geo-distribut > **Note:** > - >`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). + > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. > > For the further information about labels and the number of Raft Group replicas, see [Schedule Replicas by Topology Labels](/schedule-replicas-by-topology-labels.md). > ->**Note:** -> > - You do not need to manually create the `tidb` user in the configuration file. The TiUP cluster component automatically creates the `tidb` user on the target machines. You can customize the user, or keep the user consistent with the control machine. > - If you configure the deployment directory as a relative path, the cluster will be deployed in the home directory of the user. diff --git a/multi-data-centers-in-one-city-deployment.md b/multi-data-centers-in-one-city-deployment.md index d4dbdcc0080e3..274e7b2b5d73d 100644 --- a/multi-data-centers-in-one-city-deployment.md +++ b/multi-data-centers-in-one-city-deployment.md @@ -71,9 +71,9 @@ member leader_priority pdName2 4 member leader_priority pdName3 3 ``` -**Note** +**Note:** -`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). +Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. **Disadvantages:** diff --git a/three-data-centers-in-two-cities-deployment.md b/three-data-centers-in-two-cities-deployment.md index 3d569b86409b1..99eb135e803e2 100644 --- a/three-data-centers-in-two-cities-deployment.md +++ b/three-data-centers-in-two-cities-deployment.md @@ -195,7 +195,7 @@ In the deployment of three DCs in two cities, to optimize performance, you need > **Note:** > - >`label-property` is not supported in the TiDB v5.2 and later versions by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). + >Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. - Configure the priority of PD. To avoid the situation where the PD leader is in another city (IDC3), you can increase the priority of local PD (in Seattle) and decrease the priority of PD in another city (San Francisco). The larger the number, the higher the priority. From fd28a349658a73ae30ecd70a6c350749a4ac5767 Mon Sep 17 00:00:00 2001 From: Enwei Date: Fri, 20 Aug 2021 08:42:51 +0200 Subject: [PATCH 4/7] revise translation Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com> --- config-templates/geo-redundancy-deployment.yaml | 2 +- geo-distributed-deployment-topology.md | 4 ++-- multi-data-centers-in-one-city-deployment.md | 2 +- three-data-centers-in-two-cities-deployment.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config-templates/geo-redundancy-deployment.yaml b/config-templates/geo-redundancy-deployment.yaml index eddf777260365..d248268c81855 100644 --- a/config-templates/geo-redundancy-deployment.yaml +++ b/config-templates/geo-redundancy-deployment.yaml @@ -29,7 +29,7 @@ server_configs: pd: replication.location-labels: ["zone","dc","rack","host"] replication.max-replicas: 5 - label-property: Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. + label-property: # Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. reject-leader: - key: "dc" value: "sha" diff --git a/geo-distributed-deployment-topology.md b/geo-distributed-deployment-topology.md index 4cab9ab9baba0..ddb31fccb1b38 100644 --- a/geo-distributed-deployment-topology.md +++ b/geo-distributed-deployment-topology.md @@ -87,8 +87,8 @@ This section describes the key parameter configuration of the TiDB geo-distribut > **Note:** > > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. -> -> For the further information about labels and the number of Raft Group replicas, see [Schedule Replicas by Topology Labels](/schedule-replicas-by-topology-labels.md). +For the further information about labels and the number of Raft Group replicas, see [Schedule Replicas by Topology Labels](/schedule-replicas-by-topology-labels.md). +> **Note:** > > - You do not need to manually create the `tidb` user in the configuration file. The TiUP cluster component automatically creates the `tidb` user on the target machines. You can customize the user, or keep the user consistent with the control machine. > - If you configure the deployment directory as a relative path, the cluster will be deployed in the home directory of the user. diff --git a/multi-data-centers-in-one-city-deployment.md b/multi-data-centers-in-one-city-deployment.md index 274e7b2b5d73d..9b7131195a275 100644 --- a/multi-data-centers-in-one-city-deployment.md +++ b/multi-data-centers-in-one-city-deployment.md @@ -73,7 +73,7 @@ member leader_priority pdName3 3 **Note:** -Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. +Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules](/configure-placement-rules.md). **Disadvantages:** diff --git a/three-data-centers-in-two-cities-deployment.md b/three-data-centers-in-two-cities-deployment.md index 99eb135e803e2..7af1fde670266 100644 --- a/three-data-centers-in-two-cities-deployment.md +++ b/three-data-centers-in-two-cities-deployment.md @@ -195,7 +195,7 @@ In the deployment of three DCs in two cities, to optimize performance, you need > **Note:** > - >Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. + > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules](/configure-placement-rules.md). - Configure the priority of PD. To avoid the situation where the PD leader is in another city (IDC3), you can increase the priority of local PD (in Seattle) and decrease the priority of PD in another city (San Francisco). The larger the number, the higher the priority. From e9ced8a726f1e7eeedd512410176f055f4b00090 Mon Sep 17 00:00:00 2001 From: en-jin19 Date: Fri, 20 Aug 2021 08:58:46 +0200 Subject: [PATCH 5/7] add links and edit format --- geo-distributed-deployment-topology.md | 4 +++- multi-data-centers-in-one-city-deployment.md | 6 +++--- three-data-centers-in-two-cities-deployment.md | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/geo-distributed-deployment-topology.md b/geo-distributed-deployment-topology.md index ddb31fccb1b38..dbf9364e26682 100644 --- a/geo-distributed-deployment-topology.md +++ b/geo-distributed-deployment-topology.md @@ -86,8 +86,10 @@ This section describes the key parameter configuration of the TiDB geo-distribut > **Note:** > - > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. + > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the [Placement Rules](/configure-placement-rules.md). + For the further information about labels and the number of Raft Group replicas, see [Schedule Replicas by Topology Labels](/schedule-replicas-by-topology-labels.md). + > **Note:** > > - You do not need to manually create the `tidb` user in the configuration file. The TiUP cluster component automatically creates the `tidb` user on the target machines. You can customize the user, or keep the user consistent with the control machine. diff --git a/multi-data-centers-in-one-city-deployment.md b/multi-data-centers-in-one-city-deployment.md index 9b7131195a275..a25bb08370548 100644 --- a/multi-data-centers-in-one-city-deployment.md +++ b/multi-data-centers-in-one-city-deployment.md @@ -71,9 +71,9 @@ member leader_priority pdName2 4 member leader_priority pdName3 3 ``` -**Note:** - -Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules](/configure-placement-rules.md). +> **Note:** +> +> Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules](/configure-placement-rules.md). **Disadvantages:** diff --git a/three-data-centers-in-two-cities-deployment.md b/three-data-centers-in-two-cities-deployment.md index 7af1fde670266..f4e7337fcf741 100644 --- a/three-data-centers-in-two-cities-deployment.md +++ b/three-data-centers-in-two-cities-deployment.md @@ -195,7 +195,7 @@ In the deployment of three DCs in two cities, to optimize performance, you need > **Note:** > - > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules](/configure-placement-rules.md). + > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the [Placement Rules](/configure-placement-rules.md). - Configure the priority of PD. To avoid the situation where the PD leader is in another city (IDC3), you can increase the priority of local PD (in Seattle) and decrease the priority of PD in another city (San Francisco). The larger the number, the higher the priority. From 1bf5648070abeb30a3def3854c105d2c787d5815 Mon Sep 17 00:00:00 2001 From: en-jin19 Date: Fri, 20 Aug 2021 09:01:20 +0200 Subject: [PATCH 6/7] Update multi-data-centers-in-one-city-deployment.md --- multi-data-centers-in-one-city-deployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multi-data-centers-in-one-city-deployment.md b/multi-data-centers-in-one-city-deployment.md index a25bb08370548..e6385de869c80 100644 --- a/multi-data-centers-in-one-city-deployment.md +++ b/multi-data-centers-in-one-city-deployment.md @@ -73,7 +73,7 @@ member leader_priority pdName3 3 > **Note:** > -> Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules](/configure-placement-rules.md). +> Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the [Placement Rules](/configure-placement-rules.md). **Disadvantages:** From d7cca2f6c034236495725abb00f5b04cce151509 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Fri, 20 Aug 2021 15:35:25 +0800 Subject: [PATCH 7/7] Apply suggestions from code review --- config-templates/geo-redundancy-deployment.yaml | 2 +- geo-distributed-deployment-topology.md | 2 +- multi-data-centers-in-one-city-deployment.md | 2 +- three-data-centers-in-two-cities-deployment.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-templates/geo-redundancy-deployment.yaml b/config-templates/geo-redundancy-deployment.yaml index d248268c81855..74ad7ecddca3a 100644 --- a/config-templates/geo-redundancy-deployment.yaml +++ b/config-templates/geo-redundancy-deployment.yaml @@ -29,7 +29,7 @@ server_configs: pd: replication.location-labels: ["zone","dc","rack","host"] replication.max-replicas: 5 - label-property: # Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the Placement Rules. + label-property: # Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the placement rules. reject-leader: - key: "dc" value: "sha" diff --git a/geo-distributed-deployment-topology.md b/geo-distributed-deployment-topology.md index dbf9364e26682..858f6e48acc6f 100644 --- a/geo-distributed-deployment-topology.md +++ b/geo-distributed-deployment-topology.md @@ -86,7 +86,7 @@ This section describes the key parameter configuration of the TiDB geo-distribut > **Note:** > - > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the [Placement Rules](/configure-placement-rules.md). + > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). For the further information about labels and the number of Raft Group replicas, see [Schedule Replicas by Topology Labels](/schedule-replicas-by-topology-labels.md). diff --git a/multi-data-centers-in-one-city-deployment.md b/multi-data-centers-in-one-city-deployment.md index e6385de869c80..3681434d41e7f 100644 --- a/multi-data-centers-in-one-city-deployment.md +++ b/multi-data-centers-in-one-city-deployment.md @@ -73,7 +73,7 @@ member leader_priority pdName3 3 > **Note:** > -> Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the [Placement Rules](/configure-placement-rules.md). +> Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). **Disadvantages:** diff --git a/three-data-centers-in-two-cities-deployment.md b/three-data-centers-in-two-cities-deployment.md index f4e7337fcf741..dbb465d5b825a 100644 --- a/three-data-centers-in-two-cities-deployment.md +++ b/three-data-centers-in-two-cities-deployment.md @@ -195,7 +195,7 @@ In the deployment of three DCs in two cities, to optimize performance, you need > **Note:** > - > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the [Placement Rules](/configure-placement-rules.md). + > Since TiDB 5.2, the `label-property` configuration is not supported by default. To set the replica policy, use the [placement rules](/configure-placement-rules.md). - Configure the priority of PD. To avoid the situation where the PD leader is in another city (IDC3), you can increase the priority of local PD (in Seattle) and decrease the priority of PD in another city (San Francisco). The larger the number, the higher the priority.