From 253e9e0b575ce831a8b9c6935fa9d1b3ea13bf03 Mon Sep 17 00:00:00 2001 From: Liuxiaozhen12 Date: Thu, 5 Aug 2021 16:11:29 +0800 Subject: [PATCH 1/4] tiup: add notice about importing cluster --- tiup/tiup-component-cluster-import.md | 1 + 1 file changed, 1 insertion(+) diff --git a/tiup/tiup-component-cluster-import.md b/tiup/tiup-component-cluster-import.md index d9cf8054aacf1..d12b9d9024802 100644 --- a/tiup/tiup-component-cluster-import.md +++ b/tiup/tiup-component-cluster-import.md @@ -17,6 +17,7 @@ Before TiDB v4.0, TiDB clusters were mainly deployed using TiDB Ansible. For TiD > + Clusters with TiDB Lightning/TiKV Importer enabled > + Clusters still using the old `push` mode to collect monitoring metrics (if you keep the default mode `pull` unchanged, using the `import` command is supported) > + Clusters in which the non-default ports (the ports configured in the `group_vars` directory are compatible) are separately configured in the `inventory.ini` configuration file using `node_exporter_port` / `blackbox_exporter_port` +> + If some nodes in the cluster deployed with TiDB Ansible are not deployed with monitoring components, you should first use TiDB Ansible to add the corresponding node information in `monitored_servers`section of `inventory.ini` file, and then use `deploy.yaml` playbook to fully deployed monitoring components. Otherwise, after data is imported into TiUP, when you perform other maintenance operations, errors might occur due to the lack of monitoring components. ## Syntax From 57ce0a356be7dea88db20b865f5e6d84744f7adf Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 5 Aug 2021 18:03:33 +0800 Subject: [PATCH 2/4] add indentation --- tiup/tiup-component-cluster-import.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tiup/tiup-component-cluster-import.md b/tiup/tiup-component-cluster-import.md index d12b9d9024802..ac153817d7d1b 100644 --- a/tiup/tiup-component-cluster-import.md +++ b/tiup/tiup-component-cluster-import.md @@ -10,13 +10,13 @@ Before TiDB v4.0, TiDB clusters were mainly deployed using TiDB Ansible. For TiD > > + After importing the TiDB Ansible configuration to TiUP for management, **DO NOT** use TiDB Ansible for cluster operations anymore. Otherwise, conflicts might be caused due to inconsistent meta information. > + If the clusters deployed using TiDB Ansible are in any of the following situations, do not use the `import` command. -> + Clusters with TLS encryption enabled -> + Pure KV clusters (clusters without TiDB instances) -> + Clusters with Kafka enabled -> + Clusters with Spark enabled -> + Clusters with TiDB Lightning/TiKV Importer enabled -> + Clusters still using the old `push` mode to collect monitoring metrics (if you keep the default mode `pull` unchanged, using the `import` command is supported) -> + Clusters in which the non-default ports (the ports configured in the `group_vars` directory are compatible) are separately configured in the `inventory.ini` configuration file using `node_exporter_port` / `blackbox_exporter_port` +> + Clusters with TLS encryption enabled +> + Pure KV clusters (clusters without TiDB instances) +> + Clusters with Kafka enabled +> + Clusters with Spark enabled +> + Clusters with TiDB Lightning/TiKV Importer enabled +> + Clusters still using the old `push` mode to collect monitoring metrics (if you keep the default mode `pull` unchanged, using the `import` command is supported) +> + Clusters in which the non-default ports (the ports configured in the `group_vars` directory are compatible) are separately configured in the `inventory.ini` configuration file using `node_exporter_port` / `blackbox_exporter_port` > + If some nodes in the cluster deployed with TiDB Ansible are not deployed with monitoring components, you should first use TiDB Ansible to add the corresponding node information in `monitored_servers`section of `inventory.ini` file, and then use `deploy.yaml` playbook to fully deployed monitoring components. Otherwise, after data is imported into TiUP, when you perform other maintenance operations, errors might occur due to the lack of monitoring components. ## Syntax From ce3aa679f3062510fa5ef33a989de9729aafa2ae Mon Sep 17 00:00:00 2001 From: Liuxiaozhen12 <82579298+Liuxiaozhen12@users.noreply.github.com> Date: Thu, 5 Aug 2021 19:23:59 +0800 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com> --- tiup/tiup-component-cluster-import.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiup/tiup-component-cluster-import.md b/tiup/tiup-component-cluster-import.md index ac153817d7d1b..4cdbbb435f997 100644 --- a/tiup/tiup-component-cluster-import.md +++ b/tiup/tiup-component-cluster-import.md @@ -17,7 +17,7 @@ Before TiDB v4.0, TiDB clusters were mainly deployed using TiDB Ansible. For TiD > + Clusters with TiDB Lightning/TiKV Importer enabled > + Clusters still using the old `push` mode to collect monitoring metrics (if you keep the default mode `pull` unchanged, using the `import` command is supported) > + Clusters in which the non-default ports (the ports configured in the `group_vars` directory are compatible) are separately configured in the `inventory.ini` configuration file using `node_exporter_port` / `blackbox_exporter_port` -> + If some nodes in the cluster deployed with TiDB Ansible are not deployed with monitoring components, you should first use TiDB Ansible to add the corresponding node information in `monitored_servers`section of `inventory.ini` file, and then use `deploy.yaml` playbook to fully deployed monitoring components. Otherwise, after data is imported into TiUP, when you perform other maintenance operations, errors might occur due to the lack of monitoring components. +> + If some nodes in the cluster deployed using TiDB Ansible are deployed without monitoring components, you should first use TiDB Ansible to add the corresponding node information in the `monitored_servers` section of the `inventory.ini` file, and then use the `deploy.yaml` playbook to fully deploy monitoring components. Otherwise, when you perform maintenance operations after data is imported into TiUP, errors might occur due to the lack of monitoring components. ## Syntax From 217c714638a70cd27fcdda3a495237be7603ea03 Mon Sep 17 00:00:00 2001 From: Liuxiaozhen12 <82579298+Liuxiaozhen12@users.noreply.github.com> Date: Fri, 27 Aug 2021 17:12:39 +0800 Subject: [PATCH 4/4] Update tiup/tiup-component-cluster-import.md Co-authored-by: Allen Zhong --- tiup/tiup-component-cluster-import.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiup/tiup-component-cluster-import.md b/tiup/tiup-component-cluster-import.md index 4cdbbb435f997..bd2fedc7fb34b 100644 --- a/tiup/tiup-component-cluster-import.md +++ b/tiup/tiup-component-cluster-import.md @@ -17,7 +17,7 @@ Before TiDB v4.0, TiDB clusters were mainly deployed using TiDB Ansible. For TiD > + Clusters with TiDB Lightning/TiKV Importer enabled > + Clusters still using the old `push` mode to collect monitoring metrics (if you keep the default mode `pull` unchanged, using the `import` command is supported) > + Clusters in which the non-default ports (the ports configured in the `group_vars` directory are compatible) are separately configured in the `inventory.ini` configuration file using `node_exporter_port` / `blackbox_exporter_port` -> + If some nodes in the cluster deployed using TiDB Ansible are deployed without monitoring components, you should first use TiDB Ansible to add the corresponding node information in the `monitored_servers` section of the `inventory.ini` file, and then use the `deploy.yaml` playbook to fully deploy monitoring components. Otherwise, when you perform maintenance operations after data is imported into TiUP, errors might occur due to the lack of monitoring components. +> + If some nodes in the cluster deployed using TiDB Ansible are deployed without monitoring components, you should first use TiDB Ansible to add the corresponding node information in the `monitored_servers` section of the `inventory.ini` file, and then use the `deploy.yaml` playbook to fully deploy monitoring components. Otherwise, when you perform maintenance operations after the cluster is imported into TiUP, errors might occur due to the lack of monitoring components. ## Syntax