From 337dcf50b6d6d6cda9e14e718cd664c372b6f637 Mon Sep 17 00:00:00 2001 From: deanglc <29059624+deanglc@users.noreply.github.com> Date: Thu, 22 Apr 2021 11:11:54 +0800 Subject: [PATCH 1/2] cherry pick #5401 to master Signed-off-by: ti-srebot --- tikv-configuration-file.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tikv-configuration-file.md b/tikv-configuration-file.md index 07812870a57a0..44de50e5246ac 100644 --- a/tikv-configuration-file.md +++ b/tikv-configuration-file.md @@ -273,7 +273,11 @@ Configuration items related to storage + Note: The TTL feature is only available for the RawKV interface for now. You can only configure this feature when creating a new cluster because TTL uses different data formats in the storage layer. If you modify this item on an existing cluster, TiKV reports errors when it starts. + Default value: `false` +<<<<<<< HEAD ### `ttl-poll-check-interval` +======= +### `ttl-check-poll-interval` New in v5.0 GA +>>>>>>> c940d05d... correct a tikv config name (#5401) + The interval of checking data to reclaim physical spaces. If data reaches its TTL, TiKV forcibly reclaims its physical space during the check. + Default value: `"12h"` From 9292b14b16ab698177d265ddd65e2080af0d1e29 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 22 Apr 2021 11:19:53 +0800 Subject: [PATCH 2/2] Update tikv-configuration-file.md --- tikv-configuration-file.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tikv-configuration-file.md b/tikv-configuration-file.md index 44de50e5246ac..5044c41a2a5ba 100644 --- a/tikv-configuration-file.md +++ b/tikv-configuration-file.md @@ -273,11 +273,7 @@ Configuration items related to storage + Note: The TTL feature is only available for the RawKV interface for now. You can only configure this feature when creating a new cluster because TTL uses different data formats in the storage layer. If you modify this item on an existing cluster, TiKV reports errors when it starts. + Default value: `false` -<<<<<<< HEAD -### `ttl-poll-check-interval` -======= -### `ttl-check-poll-interval` New in v5.0 GA ->>>>>>> c940d05d... correct a tikv config name (#5401) +### `ttl-check-poll-interval` + The interval of checking data to reclaim physical spaces. If data reaches its TTL, TiKV forcibly reclaims its physical space during the check. + Default value: `"12h"`