From a44ed92c56bed38e95e3c26bf03d9df0fff54b86 Mon Sep 17 00:00:00 2001 From: Kamil Date: Tue, 20 Feb 2024 12:40:37 +0100 Subject: [PATCH 1/2] Add back missing compaction throughput options --- cmd/influxd/launcher/cmd.go | 5 +++++ cmd/influxd/upgrade/config.go | 1 + 2 files changed, 6 insertions(+) diff --git a/cmd/influxd/launcher/cmd.go b/cmd/influxd/launcher/cmd.go index 35a97601349..7926d1d16af 100644 --- a/cmd/influxd/launcher/cmd.go +++ b/cmd/influxd/launcher/cmd.go @@ -537,6 +537,11 @@ func (o *InfluxdOpts) BindCliOpts() []cli.Opt { Flag: "storage-compact-full-write-cold-duration", Desc: "The duration at which the engine will compact all TSM files in a shard if it hasn't received a write or delete.", }, + { + DestP: &o.StorageConfig.Data.CompactThroughput, + Flag: "storage-compact-throughput", + Desc: "Throughput per sec", + }, { DestP: &o.StorageConfig.Data.CompactThroughputBurst, Flag: "storage-compact-throughput-burst", diff --git a/cmd/influxd/upgrade/config.go b/cmd/influxd/upgrade/config.go index abedd66a7fa..88a117a36e1 100644 --- a/cmd/influxd/upgrade/config.go +++ b/cmd/influxd/upgrade/config.go @@ -26,6 +26,7 @@ var passthroughConfigRules = map[string]string{ "data.cache-snapshot-memory-size": "storage-cache-snapshot-memory-size", "data.cache-snapshot-write-cold-duration": "storage-cache-snapshot-write-cold-duration", "data.compact-full-write-cold-duration": "storage-compact-full-write-cold-duration", + "data.compact-throughput": "storage-compact-throughput", "data.compact-throughput-burst": "storage-compact-throughput-burst", "data.max-concurrent-compactions": "storage-max-concurrent-compactions", "data.max-index-log-file-size": "storage-max-index-log-file-size", From e5843b9c2f637262756f1b441d859a687cb72d50 Mon Sep 17 00:00:00 2001 From: Kamil Date: Tue, 20 Feb 2024 12:48:04 +0100 Subject: [PATCH 2/2] Improve description --- cmd/influxd/launcher/cmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/influxd/launcher/cmd.go b/cmd/influxd/launcher/cmd.go index 7926d1d16af..cce1a188d76 100644 --- a/cmd/influxd/launcher/cmd.go +++ b/cmd/influxd/launcher/cmd.go @@ -540,7 +540,7 @@ func (o *InfluxdOpts) BindCliOpts() []cli.Opt { { DestP: &o.StorageConfig.Data.CompactThroughput, Flag: "storage-compact-throughput", - Desc: "Throughput per sec", + Desc: "The rate limit in bytes per second that we will allow TSM compactions to write to disk. This option overwrites throughput-burst when throughput > throughput-burst", }, { DestP: &o.StorageConfig.Data.CompactThroughputBurst,