From 436dcaf10e93919e47cf905aeaf97bb5db19927b Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 15 Apr 2021 14:23:42 +0800 Subject: [PATCH 1/2] tiup: align rest files in docs-cn#4868 --- TOC.md | 5 ++++- geo-distributed-deployment-topology.md | 2 ++ hybrid-deployment-topology.md | 2 ++ minimal-deployment-topology.md | 2 ++ ticdc-deployment-topology.md | 2 ++ tidb-binlog-deployment-topology.md | 2 ++ tiflash-deployment-topology.md | 2 ++ tispark-deployment-topology.md | 2 ++ tiup/tiup-cluster.md | 2 +- tiup/tiup-documentation-guide.md | 18 ++++++------------ 10 files changed, 25 insertions(+), 14 deletions(-) diff --git a/TOC.md b/TOC.md index 912f3d01eff9e..bce6ef5a3dbdb 100644 --- a/TOC.md +++ b/TOC.md @@ -506,12 +506,15 @@ + [Overview](/tiflash/tiflash-overview.md) + [Use TiFlash](/tiflash/use-tiflash.md) + TiUP - + [Documentation Guide](/tiup/tiup-documentation-guide.md) + + [Documentation Map](/tiup/tiup-documentation-guide.md) + [Overview](/tiup/tiup-overview.md) + [Terminology and Concepts](/tiup/tiup-terminology-and-concepts.md) + [Manage TiUP Components](/tiup/tiup-component-management.md) + [FAQ](/tiup/tiup-faq.md) + [Troubleshooting Guide](/tiup/tiup-troubleshooting-guide.md) + + [Reference Guide](/tiup/tiup-reference.md) + + [Cluster Topology Reference](/tiup/tiup-cluster-topology-reference.md) + + [Mirror Reference Guide](/tiup/tiup-mirror-reference.md) + TiUP Components + [tiup-playground](/tiup/tiup-playground.md) + [tiup-cluster](/tiup/tiup-cluster.md) diff --git a/geo-distributed-deployment-topology.md b/geo-distributed-deployment-topology.md index 2dd74ec632681..4aa42fc0199d4 100644 --- a/geo-distributed-deployment-topology.md +++ b/geo-distributed-deployment-topology.md @@ -21,6 +21,8 @@ This document takes the typical architecture of three data centers (DC) in two c - [The geo-distributed topology template](https://github.com/pingcap/docs/blob/master/config-templates/geo-redundancy-deployment.yaml) +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). + ### Key parameters This section describes the key parameter configuration of the TiDB geo-distributed deployment. diff --git a/hybrid-deployment-topology.md b/hybrid-deployment-topology.md index 370f83f78ed24..1abd24d8d81cf 100644 --- a/hybrid-deployment-topology.md +++ b/hybrid-deployment-topology.md @@ -26,6 +26,8 @@ The deployment machine has multiple CPU processors with sufficient memory. To im - [The simple template for the hybrid deployment](https://github.com/pingcap/docs-cn/blob/master/config-templates/simple-multi-instance.yaml) - [The complex template for the hybrid deployment](https://github.com/pingcap/docs/blob/master/config-templates/complex-multi-instance.yaml) +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). + ### Key parameters 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. diff --git a/minimal-deployment-topology.md b/minimal-deployment-topology.md index 973cf3ca98f7d..c17babeb87072 100644 --- a/minimal-deployment-topology.md +++ b/minimal-deployment-topology.md @@ -22,6 +22,8 @@ This document describes the minimal deployment topology of TiDB clusters. - [The simple template for the minimal topology](https://github.com/pingcap/docs/blob/master/config-templates/simple-mini.yaml) - [The complex template for the minimal topology](https://github.com/pingcap/docs/blob/master/config-templates/complex-mini.yaml) +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). + > **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/ticdc-deployment-topology.md b/ticdc-deployment-topology.md index a50d79099cca0..761cbad6a4681 100644 --- a/ticdc-deployment-topology.md +++ b/ticdc-deployment-topology.md @@ -29,6 +29,8 @@ TiCDC is a tool for replicating the incremental data of TiDB, introduced in TiDB - [The simple template for the TiCDC topology](https://github.com/pingcap/docs/blob/master/config-templates/simple-cdc.yaml) - [The complex template for the TiCDC topology](https://github.com/pingcap/docs/blob/master/config-templates/complex-cdc.yaml) +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). + > **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/tidb-binlog-deployment-topology.md b/tidb-binlog-deployment-topology.md index c8b34a25e546a..3f991426c7b2b 100644 --- a/tidb-binlog-deployment-topology.md +++ b/tidb-binlog-deployment-topology.md @@ -26,6 +26,8 @@ TiDB Binlog is the widely used component for replicating incremental data. It pr - [The simple template for the TiDB Binlog topology (with `file` as the downstream type)](https://github.com/pingcap/docs/blob/master/config-templates/simple-file-binlog.yaml) - [The complex template for the TiDB Binlog topology](https://github.com/pingcap/docs/blob/master/config-templates/complex-tidb-binlog.yaml) +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). + ### Key parameters The key parameters in the topology configuration templates are as follows: diff --git a/tiflash-deployment-topology.md b/tiflash-deployment-topology.md index 76ab83287f930..39196a252e966 100644 --- a/tiflash-deployment-topology.md +++ b/tiflash-deployment-topology.md @@ -25,6 +25,8 @@ TiFlash is a columnar storage engine, and gradually becomes the standard cluster - [The simple template for the TiFlash topology](https://github.com/pingcap/docs/blob/master/config-templates/simple-tiflash.yaml) - [The complex template for the TiFlash topology](https://github.com/pingcap/docs/blob/master/config-templates/complex-tiflash.yaml) +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). + ### Key parameters - 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`. diff --git a/tispark-deployment-topology.md b/tispark-deployment-topology.md index ae8e2b3df4e8e..53da7b9dc48dc 100644 --- a/tispark-deployment-topology.md +++ b/tispark-deployment-topology.md @@ -30,6 +30,8 @@ For more information about the TiSpark architecture and how to use it, see [TiSp - [Simple TiSpark topology template](https://github.com/pingcap/docs/blob/master/config-templates/simple-tispark.yaml) - [Complex TiSpark topology template](https://github.com/pingcap/docs/blob/master/config-templates/complex-tispark.yaml) +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). + > **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/tiup/tiup-cluster.md b/tiup/tiup-cluster.md index 5ab85760c518d..409908b3d9f87 100644 --- a/tiup/tiup-cluster.md +++ b/tiup/tiup-cluster.md @@ -220,7 +220,7 @@ For the PD component, `|L` or `|UI` might be appended to `Up` or `Down`. `|L` in > > 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). -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. +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. 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. diff --git a/tiup/tiup-documentation-guide.md b/tiup/tiup-documentation-guide.md index c86e0c28fd204..5d7696385a540 100644 --- a/tiup/tiup-documentation-guide.md +++ b/tiup/tiup-documentation-guide.md @@ -1,26 +1,20 @@ --- -title: TiUP Documentation Guide +title: TiUP Documentation Map summary: Guide you through TiUP documentation with links and introductions. aliases: ['/docs/dev/tiup/tiup-documentation-guide/'] --- -# TiUP Documentation Guide +# TiUP Documentation Map -## TiUP user guide +## User guide -- [TiUP Overview](/tiup/tiup-overview.md): Gives an overall introduction to TiUP, for example, how to install and use TiUP +- [TiUP Overview](/tiup/tiup-overview.md): Gives an overall introduction to TiUP, for example, how to install and use TiUP, and the related terminologies. - [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 - [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 - [TiUP FAQ](/tiup/tiup-faq.md): Introduces common issues when you use TiUP, including FAQs of the third-party components of TiUP - [TiUP Troubleshooting Guide](/tiup/tiup-troubleshooting-guide.md): Introduces the troubleshooting methods and solutions if you encounter issues when using TiUP - -## TiUP component user guide - -- [tiup-playground](/tiup/tiup-playground.md): Introduces how to use the TiUP playground component to quickly build a local TiDB cluster for testing -- [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 -- [tiup-mirror](/tiup/tiup-mirror.md): Introduces how to use the TiUP mirror component to customize a local offline mirror -- [tiup-bench](/tiup/tiup-bench.md): Introduces how to use the TiUP bench component for common stress testings, such as TPCC/TPCH +- [TiUP Reference Guide](/tiup/tiup-reference.md): Introduces detailed references, including commands, components, and mirrors. ## TiUP resources -- [TiUP Issues](https://github.com/pingcap/tiup/issues): Lists TiUP Github issues \ No newline at end of file +- [TiUP Issues](https://github.com/pingcap/tiup/issues): Lists TiUP Github issues From 3bbb7d9dcaa42b386f1d5c453182bb116d90208b Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 15 Apr 2021 14:46:35 +0800 Subject: [PATCH 2/2] Update tiup/tiup-documentation-guide.md Co-authored-by: Ran --- tiup/tiup-documentation-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiup/tiup-documentation-guide.md b/tiup/tiup-documentation-guide.md index 5d7696385a540..629648a6d5280 100644 --- a/tiup/tiup-documentation-guide.md +++ b/tiup/tiup-documentation-guide.md @@ -17,4 +17,4 @@ aliases: ['/docs/dev/tiup/tiup-documentation-guide/'] ## TiUP resources -- [TiUP Issues](https://github.com/pingcap/tiup/issues): Lists TiUP Github issues +- [TiUP Issues](https://github.com/pingcap/tiup/issues): Lists TiUP GitHub issues