Merge branch 'master' into disksing/dr-autosync-config-2

br/backup-and-restore-overview.md

@@ -25,6 +25,7 @@ This section describes the prerequisites for using TiDB backup and restore, incl
 - PITR only supports cluster-level restore and does not support database-level or table-level restore.
 - PITR does not support restoring the data of user tables or privilege tables from system tables.
 - BR does not support running multiple backup tasks on a cluster **at the same time**.
+- BR does not support running snapshot backup tasks and data restore tasks on a cluster **at the same time**.
 - When a PITR is running, you cannot run a log backup task or use TiCDC to replicate data to a downstream cluster.
 
 ### Some tips

two-data-centers-in-one-city-deployment.md

@@ -222,6 +222,7 @@ The replication mode is controlled by PD. You can configure the replication mode
     dr-replicas = 2
     wait-store-timeout = "1m"
     wait-recover-timeout = "0s"
+    pause-region-split = false  
     ```
 
 - Method 2: If you have deployed a cluster, use pd-ctl commands to modify the configurations of PD.
@@ -242,9 +243,10 @@ Descriptions of configuration items:
 + `replication-mode` is the replication mode to be enabled. In the preceding example, it is set to `dr-auto-sync`. By default, the majority protocol is used.
 + `label-key` is used to distinguish different AZs and needs to match Placement Rules. In this example, the primary AZ is "east" and the disaster recovery AZ is "west".
 + `primary-replicas` is the number of Voter replicas in the primary AZ.
-+ `dr-replicas` is the number of Voter replicas in the disaster recovery AZ.
++ `dr-replicas` is the number of Voter replicas in the disaster recovery (DR) AZ.
 + `wait-store-timeout` is the waiting time for switching to asynchronous replication mode when network isolation or failure occurs. If the time of network failure exceeds the waiting time, asynchronous replication mode is enabled. The default waiting time is 60 seconds.
 + `wait-recover-timeout` is the waiting time for switching back to the `sync-recover` status after the network recovers. The default value is 0 seconds.
++ `pause-region-split` controls whether to pause Region split operations in the `async_wait` and `async` statuses. Pausing Region split can prevent temporary partial data loss in the DR AZ when synchronizing data in the `sync-recover` status. The default value is `false`.
 
 To check the current replication status of the cluster, use the following API: