From 60e739fd8449b29833f17a2586121faf04f535b5 Mon Sep 17 00:00:00 2001 From: TomShawn <1135243111@qq.com> Date: Wed, 22 Apr 2020 16:05:58 +0800 Subject: [PATCH 1/2] tiup: add description in tiup upgrade doc --- how-to/upgrade/using-tiup.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/how-to/upgrade/using-tiup.md b/how-to/upgrade/using-tiup.md index bf7299f0b553f..410694d53451e 100644 --- a/how-to/upgrade/using-tiup.md +++ b/how-to/upgrade/using-tiup.md @@ -150,6 +150,10 @@ tiup cluster upgrade v4.0.0-rc Performing the rolling update to the cluster will update all components one by one. During the upgrade of TiKV, all leaders in a TiKV instance are evicted before stopping the instance. The default timeout time is 10 minutes. The instance is directly stopped after this timeout time. +To perform the upgrade immediately without evicting the leader, specify `--force` in the command above. This method causes performance jitter but not data loss. + +To keep the performance stable, make sure that all leaders in a TiKV instance are evicted before stopping the instance. You can set `--transfer-timeout` to a large value, for example, `--transfer-timeout 100000000` (unit: second). + ### Verify the cluster version Execute the `display` command to view the latest cluster version `TiDB Version`: From f0d5908393a54aaa601db744702f8a60c3602021 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Wed, 22 Apr 2020 19:10:57 +0800 Subject: [PATCH 2/2] Apply suggestions from code review Co-Authored-By: Keke Yi <40977455+yikeke@users.noreply.github.com> --- how-to/upgrade/using-tiup.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/how-to/upgrade/using-tiup.md b/how-to/upgrade/using-tiup.md index 410694d53451e..1b66a3fefb3f1 100644 --- a/how-to/upgrade/using-tiup.md +++ b/how-to/upgrade/using-tiup.md @@ -148,11 +148,11 @@ This section describes how to perform a rolling update to the TiDB cluster and h tiup cluster upgrade v4.0.0-rc ``` -Performing the rolling update to the cluster will update all components one by one. During the upgrade of TiKV, all leaders in a TiKV instance are evicted before stopping the instance. The default timeout time is 10 minutes. The instance is directly stopped after this timeout time. +Performing the rolling update to the cluster will update all components one by one. During the upgrade of TiKV, all leaders in a TiKV instance are evicted before stopping the instance. The default timeout time is 5 minutes. The instance is directly stopped after this timeout time. To perform the upgrade immediately without evicting the leader, specify `--force` in the command above. This method causes performance jitter but not data loss. -To keep the performance stable, make sure that all leaders in a TiKV instance are evicted before stopping the instance. You can set `--transfer-timeout` to a large value, for example, `--transfer-timeout 100000000` (unit: second). +To keep a stable performance, make sure that all leaders in a TiKV instance are evicted before stopping the instance. You can set `--transfer-timeout` to a super large value, for example, `--transfer-timeout 100000000` (unit: second). ### Verify the cluster version