Skip to content

Commit 3837194

Browse files
TomShawnti-srebot
authored andcommitted
cherry pick #5331 to release-4.0
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
1 parent 461ac77 commit 3837194

10 files changed

+25
-14
lines changed

TOC.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,12 +509,15 @@
509509
+ [Overview](/tiflash/tiflash-overview.md)
510510
+ [Use TiFlash](/tiflash/use-tiflash.md)
511511
+ TiUP
512-
+ [Documentation Guide](/tiup/tiup-documentation-guide.md)
512+
+ [Documentation Map](/tiup/tiup-documentation-guide.md)
513513
+ [Overview](/tiup/tiup-overview.md)
514514
+ [Terminology and Concepts](/tiup/tiup-terminology-and-concepts.md)
515515
+ [Manage TiUP Components](/tiup/tiup-component-management.md)
516516
+ [FAQ](/tiup/tiup-faq.md)
517517
+ [Troubleshooting Guide](/tiup/tiup-troubleshooting-guide.md)
518+
+ [Reference Guide](/tiup/tiup-reference.md)
519+
+ [Cluster Topology Reference](/tiup/tiup-cluster-topology-reference.md)
520+
+ [Mirror Reference Guide](/tiup/tiup-mirror-reference.md)
518521
+ TiUP Components
519522
+ [tiup-playground](/tiup/tiup-playground.md)
520523
+ [tiup-cluster](/tiup/tiup-cluster.md)

geo-distributed-deployment-topology.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ This document takes the typical architecture of three data centers (DC) in two c
2121

2222
- [The geo-distributed topology template](https://github.com/pingcap/docs/blob/release-4.0/config-templates/geo-redundancy-deployment.yaml)
2323

24+
For detailed descriptions of the configuration items in the above TiDB cluster topology file, see [Topology Configuration File for Deploying TiDB Using TiUP](/tiup/tiup-cluster-topology-reference.md).
25+
2426
### Key parameters
2527

2628
This section describes the key parameter configuration of the TiDB geo-distributed deployment.

hybrid-deployment-topology.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ The deployment machine has multiple CPU processors with sufficient memory. To im
2626
- [The simple template for the hybrid deployment](https://github.com/pingcap/docs/blob/release-4.0/config-templates/simple-multi-instance.yaml)
2727
- [The complex template for the hybrid deployment](https://github.com/pingcap/docs/blob/release-4.0/config-templates/complex-multi-instance.yaml)
2828

29+
For detailed descriptions of the configuration items in the above TiDB cluster topology file, see [Topology Configuration File for Deploying TiDB Using TiUP](/tiup/tiup-cluster-topology-reference.md).
30+
2931
### Key parameters
3032

3133
This section introduces the key parameters when you deploy multiple instances on a single machine, which is mainly used in scenarios when multiple instances of TiDB and TiKV are deployed on a single machine. You need to fill in the results into the configuration template according to the calculation methods provided below.

minimal-deployment-topology.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ This document describes the minimal deployment topology of TiDB clusters.
2222
- [The simple template for the minimal topology](https://github.com/pingcap/docs/blob/release-4.0/config-templates/simple-mini.yaml)
2323
- [The complex template for the minimal topology](https://github.com/pingcap/docs/blob/release-4.0/config-templates/complex-mini.yaml)
2424

25+
For detailed descriptions of the configuration items in the above TiDB cluster topology file, see [Topology Configuration File for Deploying TiDB Using TiUP](/tiup/tiup-cluster-topology-reference.md).
26+
2527
> **Note:**
2628
>
2729
> - 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.

ticdc-deployment-topology.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ TiCDC is a tool for replicating the incremental data of TiDB, introduced in TiDB
2929
- [The simple template for the TiCDC topology](https://github.com/pingcap/docs/blob/release-4.0/config-templates/simple-cdc.yaml)
3030
- [The complex template for the TiCDC topology](https://github.com/pingcap/docs/blob/release-4.0/config-templates/complex-cdc.yaml)
3131

32+
For detailed descriptions of the configuration items in the above TiDB cluster topology file, see [Topology Configuration File for Deploying TiDB Using TiUP](/tiup/tiup-cluster-topology-reference.md).
33+
3234
> **Note:**
3335
>
3436
> - 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.

tidb-binlog-deployment-topology.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ TiDB Binlog is the widely used component for replicating incremental data. It pr
2626
- [The simple template for the TiDB Binlog topology (with `file` as the downstream type)](https://github.com/pingcap/docs/blob/release-4.0/config-templates/simple-file-binlog.yaml)
2727
- [The complex template for the TiDB Binlog topology](https://github.com/pingcap/docs/blob/release-4.0/config-templates/complex-tidb-binlog.yaml)
2828

29+
For detailed descriptions of the configuration items in the above TiDB cluster topology file, see [Topology Configuration File for Deploying TiDB Using TiUP](/tiup/tiup-cluster-topology-reference.md).
30+
2931
### Key parameters
3032

3133
The key parameters in the topology configuration templates are as follows:

tiflash-deployment-topology.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ TiFlash is a columnar storage engine, and gradually becomes the standard cluster
2525
- [The simple template for the TiFlash topology](https://github.com/pingcap/docs/blob/release-4.0/config-templates/simple-tiflash.yaml)
2626
- [The complex template for the TiFlash topology](https://github.com/pingcap/docs/blob/release-4.0/config-templates/complex-tiflash.yaml)
2727

28+
For detailed descriptions of the configuration items in the above TiDB cluster topology file, see [Topology Configuration File for Deploying TiDB Using TiUP](/tiup/tiup-cluster-topology-reference.md).
29+
2830
### Key parameters
2931

3032
- To enable the [Placement Rules](/configure-placement-rules.md) feature of PD, set the value of `replication.enable-placement-rules` in the configuration template to `true`.

tispark-deployment-topology.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ For more information about the TiSpark architecture and how to use it, see [TiSp
3030
- [Simple TiSpark topology template](https://github.com/pingcap/docs/blob/master/config-templates/simple-tispark.yaml)
3131
- [Complex TiSpark topology template](https://github.com/pingcap/docs/blob/master/config-templates/complex-tispark.yaml)
3232

33+
For detailed descriptions of the configuration items in the above TiDB cluster topology file, see [Topology Configuration File for Deploying TiDB Using TiUP](/tiup/tiup-cluster-topology-reference.md).
34+
3335
> **Note:**
3436
>
3537
> - 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.

tiup/tiup-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ For the PD component, `|L` or `|UI` might be appended to `Up` or `Down`. `|L` in
222222
>
223223
> This section describes only the syntax of the scale-in command. For detailed steps of online scaling, refer to [Scale the TiDB Cluster Using TiUP](/scale-tidb-using-tiup.md).
224224
225-
Scaling in a cluster means making some node(s) offline. This operation removes the specific node(s) from the cluster and deletes the remaining data files.
225+
Scaling in a cluster means making some node(s) offline. This operation removes the specific node(s) from the cluster and deletes the remaining files.
226226

227227
Because the offline process of the TiKV and TiDB Binlog components is asynchronous (which requires removing the node through API), and the process takes a long time (which requires continuous observation on whether the node is successfully taken offline), special treatment is given to the TiKV and TiDB Binlog components.
228228

tiup/tiup-documentation-guide.md

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
---
2-
title: TiUP Documentation Guide
2+
title: TiUP Documentation Map
33
summary: Guide you through TiUP documentation with links and introductions.
44
aliases: ['/docs/stable/tiup/tiup-documentation-guide/','/docs/v4.0/tiup/tiup-documentation-guide/']
55
---
66

7-
# TiUP Documentation Guide
7+
# TiUP Documentation Map
88

9-
## TiUP user guide
9+
## User guide
1010

11-
- [TiUP Overview](/tiup/tiup-overview.md): Gives an overall introduction to TiUP, for example, how to install and use TiUP
11+
- [TiUP Overview](/tiup/tiup-overview.md): Gives an overall introduction to TiUP, for example, how to install and use TiUP, and the related terminologies.
1212
- [TiUP Terminology and Concepts](/tiup/tiup-terminology-and-concepts.md): Explains the terms that you might bump into when using TiUP, and help you understand the key concepts of TiUP
1313
- [TiUP Component Management](/tiup/tiup-component-management.md): Introduces all TiUP commands in detail, and how to use TiUP to download, update and delete components
1414
- [TiUP FAQ](/tiup/tiup-faq.md): Introduces common issues when you use TiUP, including FAQs of the third-party components of TiUP
1515
- [TiUP Troubleshooting Guide](/tiup/tiup-troubleshooting-guide.md): Introduces the troubleshooting methods and solutions if you encounter issues when using TiUP
16-
17-
## TiUP component user guide
18-
19-
- [tiup-playground](/tiup/tiup-playground.md): Introduces how to use the TiUP playground component to quickly build a local TiDB cluster for testing
20-
- [tiup-cluster](/tiup/tiup-cluster.md): Introduces the usage and command-line flags of the TiUP cluster component, which is used to deploy and maintain a TiDB cluster for production
21-
- [tiup-mirror](/tiup/tiup-mirror.md): Introduces how to use the TiUP mirror component to customize a local offline mirror
22-
- [tiup-bench](/tiup/tiup-bench.md): Introduces how to use the TiUP bench component for common stress testings, such as TPCC/TPCH
16+
- [TiUP Reference Guide](/tiup/tiup-reference.md): Introduces detailed references, including commands, components, and mirrors.
2317

2418
## TiUP resources
2519

26-
- [TiUP Issues](https://github.com/pingcap/tiup/issues): Lists TiUP Github issues
20+
- [TiUP Issues](https://github.com/pingcap/tiup/issues): Lists TiUP GitHub issues

0 commit comments

Comments
 (0)