From 563ec7d13e684a1499da41d85958c4c684f7f9fb Mon Sep 17 00:00:00 2001 From: Aolin Date: Thu, 29 Feb 2024 09:56:22 +0800 Subject: [PATCH 1/4] This is an automated cherry-pick of #16564 Signed-off-by: ti-chi-bot --- tikv-configuration-file.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tikv-configuration-file.md b/tikv-configuration-file.md index e569f7d43f55e..1b63cb145a1fc 100644 --- a/tikv-configuration-file.md +++ b/tikv-configuration-file.md @@ -2065,7 +2065,11 @@ Configuration items related to TiDB Lightning import and BR restore. + The garbage ratio threshold to trigger GC. + Default value: `1.1` +<<<<<<< HEAD ### `num-threads` New in v6.5.8 and v7.6.0 +======= +### `num-threads` New in v6.5.8 and v7.5.1 +>>>>>>> 773c3e52ff (v7.5.1: tikv configuration doc: add gc thread number (#16564)) + The number of GC threads when `enable-compaction-filter` is `false`. + Default value: `1` From 83e37fa53bd943bd0e130d1c7bcad71ce3a8c721 Mon Sep 17 00:00:00 2001 From: Aolin Date: Thu, 29 Feb 2024 10:02:33 +0800 Subject: [PATCH 2/4] Apply suggestions from code review --- 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 1b63cb145a1fc..2b41a3d340766 100644 --- a/tikv-configuration-file.md +++ b/tikv-configuration-file.md @@ -2065,11 +2065,7 @@ Configuration items related to TiDB Lightning import and BR restore. + The garbage ratio threshold to trigger GC. + Default value: `1.1` -<<<<<<< HEAD -### `num-threads` New in v6.5.8 and v7.6.0 -======= -### `num-threads` New in v6.5.8 and v7.5.1 ->>>>>>> 773c3e52ff (v7.5.1: tikv configuration doc: add gc thread number (#16564)) +### `num-threads` New in v6.5.8, v7.5.1, and v7.6.0 + The number of GC threads when `enable-compaction-filter` is `false`. + Default value: `1` From 619bdfca4cda1ce47ad5ebca3e696f61bb98a488 Mon Sep 17 00:00:00 2001 From: Aolin Date: Thu, 29 Feb 2024 10:10:37 +0800 Subject: [PATCH 3/4] resolve conflicts --- releases/release-7.6.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/release-7.6.0.md b/releases/release-7.6.0.md index 2368f78a720ec..d409c2d6238f2 100644 --- a/releases/release-7.6.0.md +++ b/releases/release-7.6.0.md @@ -284,7 +284,7 @@ Quick access: [Quick start](https://docs.pingcap.com/tidb/v7.6/quick-start-with- | TiKV | [`blob-file-compression`](/tikv-configuration-file.md#blob-file-compression) | Modified | The algorithm used for compressing values in Titan, which takes value as the unit. Starting from TiDB v7.6.0, the default compression algorithm is `zstd`. | | TiKV | [`rocksdb.defaultcf.titan.min-blob-size`](/tikv-configuration-file.md#min-blob-size) | Modified | Starting from TiDB v7.6.0, the default value for new clusters is `32KB`. For existing clusters upgrading to v7.6.0, the default value `1KB` remains unchanged. | | TiKV | [`rocksdb.titan.enabled`](/tikv-configuration-file.md#enabled) | Modified | Enables or disables Titan. For v7.5.0 and earlier versions, the default value is `false`. Starting from v7.6.0, the default value is `true` for only new clusters. Existing clusters upgraded to v7.6.0 or later versions will retain the original configuration. | -| TiKV | [`gc.num-threads`](/tikv-configuration-file.md#num-threads-new-in-v658-and-v760) | Newly added | When `enable-compaction-filter` is set to `false`, this parameter controls the number of GC threads. The default value is `1`. | +| TiKV | [`gc.num-threads`](/tikv-configuration-file.md#num-threads-new-in-v658v751-and-v760) | Newly added | When `enable-compaction-filter` is set to `false`, this parameter controls the number of GC threads. The default value is `1`. | | TiKV | [`raftstore.periodic-full-compact-start-times`](/tikv-configuration-file.md#periodic-full-compact-start-times-new-in-v760) | Newly added | Sets the specific times that TiKV initiates periodic full compaction. The default value `[]` means periodic full compaction is disabled. | | TiKV | [`raftstore.periodic-full-compact-start-max-cpu`](/tikv-configuration-file.md#periodic-full-compact-start-max-cpu-new-in-v760) | Newly added | Limits the maximum CPU usage rate for TiKV periodic full compaction. The default value is `0.1`. | | TiKV | [`zstd-dict-size`](/tikv-configuration-file.md#zstd-dict-size) | Newly added | Specifies the `zstd` dictionary compression size. The default value is `"0KB"`, which means to disable the `zstd` dictionary compression. | From b6a8dbfaa74825b4b5832810f756b567b1092664 Mon Sep 17 00:00:00 2001 From: Aolin Date: Thu, 29 Feb 2024 10:14:18 +0800 Subject: [PATCH 4/4] Apply suggestions from code review --- releases/release-7.6.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/release-7.6.0.md b/releases/release-7.6.0.md index d409c2d6238f2..7eddf00061889 100644 --- a/releases/release-7.6.0.md +++ b/releases/release-7.6.0.md @@ -284,7 +284,7 @@ Quick access: [Quick start](https://docs.pingcap.com/tidb/v7.6/quick-start-with- | TiKV | [`blob-file-compression`](/tikv-configuration-file.md#blob-file-compression) | Modified | The algorithm used for compressing values in Titan, which takes value as the unit. Starting from TiDB v7.6.0, the default compression algorithm is `zstd`. | | TiKV | [`rocksdb.defaultcf.titan.min-blob-size`](/tikv-configuration-file.md#min-blob-size) | Modified | Starting from TiDB v7.6.0, the default value for new clusters is `32KB`. For existing clusters upgrading to v7.6.0, the default value `1KB` remains unchanged. | | TiKV | [`rocksdb.titan.enabled`](/tikv-configuration-file.md#enabled) | Modified | Enables or disables Titan. For v7.5.0 and earlier versions, the default value is `false`. Starting from v7.6.0, the default value is `true` for only new clusters. Existing clusters upgraded to v7.6.0 or later versions will retain the original configuration. | -| TiKV | [`gc.num-threads`](/tikv-configuration-file.md#num-threads-new-in-v658v751-and-v760) | Newly added | When `enable-compaction-filter` is set to `false`, this parameter controls the number of GC threads. The default value is `1`. | +| TiKV | [`gc.num-threads`](/tikv-configuration-file.md#num-threads-new-in-v658-v751-and-v760) | Newly added | When `enable-compaction-filter` is set to `false`, this parameter controls the number of GC threads. The default value is `1`. | | TiKV | [`raftstore.periodic-full-compact-start-times`](/tikv-configuration-file.md#periodic-full-compact-start-times-new-in-v760) | Newly added | Sets the specific times that TiKV initiates periodic full compaction. The default value `[]` means periodic full compaction is disabled. | | TiKV | [`raftstore.periodic-full-compact-start-max-cpu`](/tikv-configuration-file.md#periodic-full-compact-start-max-cpu-new-in-v760) | Newly added | Limits the maximum CPU usage rate for TiKV periodic full compaction. The default value is `0.1`. | | TiKV | [`zstd-dict-size`](/tikv-configuration-file.md#zstd-dict-size) | Newly added | Specifies the `zstd` dictionary compression size. The default value is `"0KB"`, which means to disable the `zstd` dictionary compression. |