From b554ba541b6a440d5bb3a186a603982658e6e6f2 Mon Sep 17 00:00:00 2001 From: Liangliang Gu Date: Thu, 16 Apr 2020 15:22:26 +0800 Subject: [PATCH 1/4] cherry pick #2778 to release-3.1 Signed-off-by: sre-bot --- reference/tiflash/upgrade.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/reference/tiflash/upgrade.md b/reference/tiflash/upgrade.md index 5f7860f77183..95ee16a5c4e7 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -5,7 +5,15 @@ category: reference # 升级 TiFlash 节点 +<<<<<<< HEAD 升级 TiFlash 节点的步骤如下： +======= +> **注意：** +> +> TiFlash Pre-RC 版本升级到更高版本请联系 [PingCAP 官方](mailto:info@pingcap.com)，以获得更多资讯和帮助。 + +目前 TiFlash 暂时还不支持通过 `tiup cluster upgrade` 进行升级。 推荐使用下面的步骤进行升级： +>>>>>>> cb0e766... tiflash: add warning to upgrade from pre-rc version (#2778) 1. 备份 tidb-ansible 文件夹 From 55e07c55458696785376dc4d6e4fb51a429bf7e9 Mon Sep 17 00:00:00 2001 From: Keke Yi <40977455+yikeke@users.noreply.github.com> Date: Thu, 16 Apr 2020 15:33:35 +0800 Subject: [PATCH 2/4] Update reference/tiflash/upgrade.md --- reference/tiflash/upgrade.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/reference/tiflash/upgrade.md b/reference/tiflash/upgrade.md index 95ee16a5c4e7..07b885093a96 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -5,15 +5,11 @@ category: reference # 升级 TiFlash 节点 -<<<<<<< HEAD -升级 TiFlash 节点的步骤如下： -======= > **注意：** > > TiFlash Pre-RC 版本升级到更高版本请联系 [PingCAP 官方](mailto:info@pingcap.com)，以获得更多资讯和帮助。 目前 TiFlash 暂时还不支持通过 `tiup cluster upgrade` 进行升级。 推荐使用下面的步骤进行升级： ->>>>>>> cb0e766... tiflash: add warning to upgrade from pre-rc version (#2778) 1. 备份 tidb-ansible 文件夹 From 383ec95fbbf521088d35fbb0dd2fdb4dbb15e29e Mon Sep 17 00:00:00 2001 From: Keke Yi <40977455+yikeke@users.noreply.github.com> Date: Thu, 16 Apr 2020 15:39:11 +0800 Subject: [PATCH 3/4] Update reference/tiflash/upgrade.md --- 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 07b885093a96..0aa21c71cae2 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -9,7 +9,7 @@ category: reference > > TiFlash Pre-RC 版本升级到更高版本请联系 [PingCAP 官方](mailto:info@pingcap.com)，以获得更多资讯和帮助。 -目前 TiFlash 暂时还不支持通过 `tiup cluster upgrade` 进行升级。 推荐使用下面的步骤进行升级： +升级 TiFlash 节点的步骤如下： 1. 备份 tidb-ansible 文件夹 From a90b655f426a6964dd56f7e1d17b50e8142a5f3a Mon Sep 17 00:00:00 2001 From: Keke Yi <40977455+yikeke@users.noreply.github.com> Date: Thu, 16 Apr 2020 15:44:35 +0800 Subject: [PATCH 4/4] Update reference/tiflash/upgrade.md --- 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 0aa21c71cae2..054877261db8 100644 --- a/reference/tiflash/upgrade.md +++ b/reference/tiflash/upgrade.md @@ -9,7 +9,7 @@ category: reference > > TiFlash Pre-RC 版本升级到更高版本请联系 [PingCAP 官方](mailto:info@pingcap.com)，以获得更多资讯和帮助。 -升级 TiFlash 节点的步骤如下： +升级前请保证集群处于启动状态，升级 TiFlash 节点的步骤如下： 1. 备份 tidb-ansible 文件夹