From c4bb1e4e62691ae5d800272a209d7034dd989ae5 Mon Sep 17 00:00:00 2001 From: Enwei Date: Thu, 26 Aug 2021 09:24:05 +0200 Subject: [PATCH 1/2] This is an automated cherry-pick of #6218 Signed-off-by: ti-chi-bot --- tikv-configuration-file.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tikv-configuration-file.md b/tikv-configuration-file.md index a90b647bbce89..ea72345ed70f8 100644 --- a/tikv-configuration-file.md +++ b/tikv-configuration-file.md @@ -397,13 +397,13 @@ Configuration items related to Raftstore ### `hibernate-regions` (**Experimental**) +<<<<<<< HEAD + Enables or disables Hibernate Region. When this option is enabled, a Region idle for a long time is automatically set as hibernated. This reduces the extra overhead caused by heartbeat messages between the Raft leader and the followers for idle Regions. You can use `raftstore.peer-stale-state-check-interval` to modify the heartbeat interval between the leader and the followers of hibernated Regions. + Default value: false - -### `raftstore.peer-stale-state-check-interval` - -+ Modifies the state check interval for Regions. -+ Default value: 5 min +======= ++ Enables or disables Hibernate Region. When this option is enabled, a Region idle for a long time is automatically set as hibernated. This reduces the extra overhead caused by heartbeat messages between the Raft leader and the followers for idle Regions. You can use `peer-stale-state-check-interval` to modify the heartbeat interval between the leader and the followers of hibernated Regions. ++ Default value: `true` in v5.0.2 and later versions; `false` in versions before v5.0.2 +>>>>>>> 229a0705c (TiKV configuration: remove redundant instructions (#6218)) ### `split-region-check-tick-interval` From 13d157084349c2bf44517c772569bb427d5cceac Mon Sep 17 00:00:00 2001 From: Enwei Date: Mon, 30 Aug 2021 09:46:40 +0200 Subject: [PATCH 2/2] fix cherry pick errors --- tikv-configuration-file.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tikv-configuration-file.md b/tikv-configuration-file.md index ea72345ed70f8..50c35e3f8d078 100644 --- a/tikv-configuration-file.md +++ b/tikv-configuration-file.md @@ -397,13 +397,8 @@ Configuration items related to Raftstore ### `hibernate-regions` (**Experimental**) -<<<<<<< HEAD -+ Enables or disables Hibernate Region. When this option is enabled, a Region idle for a long time is automatically set as hibernated. This reduces the extra overhead caused by heartbeat messages between the Raft leader and the followers for idle Regions. You can use `raftstore.peer-stale-state-check-interval` to modify the heartbeat interval between the leader and the followers of hibernated Regions. -+ Default value: false -======= + Enables or disables Hibernate Region. When this option is enabled, a Region idle for a long time is automatically set as hibernated. This reduces the extra overhead caused by heartbeat messages between the Raft leader and the followers for idle Regions. You can use `peer-stale-state-check-interval` to modify the heartbeat interval between the leader and the followers of hibernated Regions. -+ Default value: `true` in v5.0.2 and later versions; `false` in versions before v5.0.2 ->>>>>>> 229a0705c (TiKV configuration: remove redundant instructions (#6218)) ++ Default value: false ### `split-region-check-tick-interval`