From 5e399e63cf9503e5d219fc44d5c5724383715205 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 15 Apr 2020 20:47:31 +0800 Subject: [PATCH 1/5] update tiflash upgrade document --- reference/tiflash/upgrade.md | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/reference/tiflash/upgrade.md b/reference/tiflash/upgrade.md index b87f5cb98186..0cc4e8e65580 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -5,9 +5,17 @@ category: reference # 升级 TiFlash 节点 -升级前请保证集群处于启动状态，升级 TiFlash 节点的步骤如下： +目前 TiFlash 暂时还不支持通过 `tiup cluster upgrade` 进行升级。 推荐使用下面的步骤进行升级： -1. 运行升级命令 +1. 将所有 TiFlash 节点进行缩容操作 + + {{< copyable "shell-regular" >}} + + ```shell + tiup cluster scale-in test --node 172.19.0.104:9000 + ``` + +2. 运行升级命令 {{< copyable "shell-regular" >}} @@ -15,7 +23,15 @@ category: reference tiup cluster upgrade test v4.0.0-rc ``` -2. 查看集群状态 +3. 运行扩容 TiFlash 的命令 + + {{< copyable "shell-regular" >}} + + ```shell + tiup cluster scale-out test scale-out.yaml + ``` + +4. 查看集群状态 {{< copyable "shell-regular" >}} @@ -23,4 +39,4 @@ category: reference tiup cluster display test ``` -3. 打开浏览器访问监控平台，监控整个集群的状态 +5. 打开浏览器访问监控平台，监控整个集群的状态 From 014d76fa808d6302aec904770308591a19ce6943 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 15 Apr 2020 21:00:58 +0800 Subject: [PATCH 2/5] address code review --- reference/tiflash/upgrade.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/reference/tiflash/upgrade.md b/reference/tiflash/upgrade.md index 0cc4e8e65580..9597de048fa4 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -7,13 +7,7 @@ category: reference 目前 TiFlash 暂时还不支持通过 `tiup cluster upgrade` 进行升级。 推荐使用下面的步骤进行升级： -1. 将所有 TiFlash 节点进行缩容操作 - - {{< copyable "shell-regular" >}} - - ```shell - tiup cluster scale-in test --node 172.19.0.104:9000 - ``` +1. 参考[缩容 TiFlash 节点](/reference/tiflash/scale.md#缩容-tiflash-节点)章节，对所有的 TiFlash 节点进行缩容操作 2. 运行升级命令 From 8b733dac69ac1366922ac5d8ed5bba219d7b4211 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 15 Apr 2020 21:57:17 +0800 Subject: [PATCH 3/5] fix ci --- reference/tiflash/upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/tiflash/upgrade.md b/reference/tiflash/upgrade.md index 9597de048fa4..5447f0573de0 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -7,7 +7,7 @@ category: reference 目前 TiFlash 暂时还不支持通过 `tiup cluster upgrade` 进行升级。 推荐使用下面的步骤进行升级： -1. 参考[缩容 TiFlash 节点](/reference/tiflash/scale.md#缩容-tiflash-节点)章节，对所有的 TiFlash 节点进行缩容操作 +1. 参考[缩容 TiFlash 节点](reference/tiflash/maintain.md#缩容-tiflash-节点)章节，对所有的 TiFlash 节点进行缩容操作 2. 运行升级命令 From ddc8bbd1565e60f2aeb4ffbae048d77c5ae74b84 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 15 Apr 2020 21:59:53 +0800 Subject: [PATCH 4/5] fix ci --- reference/tiflash/upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/tiflash/upgrade.md b/reference/tiflash/upgrade.md index 5447f0573de0..a003d165ee92 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -7,7 +7,7 @@ category: reference 目前 TiFlash 暂时还不支持通过 `tiup cluster upgrade` 进行升级。 推荐使用下面的步骤进行升级： -1. 参考[缩容 TiFlash 节点](reference/tiflash/maintain.md#缩容-tiflash-节点)章节，对所有的 TiFlash 节点进行缩容操作 +1. 参考[缩容 TiFlash 节点](/reference/tiflash/maintain.md#缩容-tiflash-节点)章节，对所有的 TiFlash 节点进行缩容操作 2. 运行升级命令 From acd06ab96932f71775554e028c51e2eefae36fed Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 15 Apr 2020 22:02:53 +0800 Subject: [PATCH 5/5] fix ci --- reference/tiflash/upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/tiflash/upgrade.md b/reference/tiflash/upgrade.md index a003d165ee92..42b02ad712a2 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -7,7 +7,7 @@ category: reference 目前 TiFlash 暂时还不支持通过 `tiup cluster upgrade` 进行升级。 推荐使用下面的步骤进行升级： -1. 参考[缩容 TiFlash 节点](/reference/tiflash/maintain.md#缩容-tiflash-节点)章节，对所有的 TiFlash 节点进行缩容操作 +1. 参考[缩容 TiFlash 节点](/how-to/scale/with-tiup.md#4-缩容-tiflash-节点)章节，对所有的 TiFlash 节点进行缩容操作 2. 运行升级命令