From 1dccdb72734d5b9aa4964aba570cfbcd768d06d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= Date: Fri, 19 Aug 2022 16:54:03 +0200 Subject: [PATCH 1/5] Remove blocks-storage.tsdb.isolation-enabled option. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Štibraný --- CHANGELOG.md | 1 + cmd/mimir/config-descriptor.json | 1 + pkg/ingester/ingester.go | 2 +- pkg/storage/tsdb/config.go | 2 -- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 414c2eb0078..fc8241f7a3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * [CHANGE] Distributor: if forwarding rules are used to forward samples, exemplars are now removed from the request. #2710 #2725 * [CHANGE] Limits: change the default value of `max_global_series_per_metric` limit to `0` (disabled). Setting this limit by default does not provide much benefit because series are sharded by all labels. #2714 * [CHANGE] Ingester: experimental `-blocks-storage.tsdb.new-chunk-disk-mapper` has been removed, new chunk disk mapper is now always used, and is no longer marked experimental. Default value of `-blocks-storage.tsdb.head-chunks-write-queue-size` has changed to 1000000, this enables async chunk queue by default. Default value of `-blocks-storage.tsdb.head-chunks-write-queue-size` has changed to 1000000, this enables async chunk queue by default, which leads to improved latency on the write path when new chunks are created in ingesters. #2762 +* [CHANGE] Ingester: removed deprecated `-blocks-storage.tsdb.isolation-enabled` option. TSDB-level isolation is now always disabled in Mimir. * [FEATURE] Introduced an experimental anonymous usage statistics tracking (disabled by default), to help Mimir maintainers driving better decisions to support the opensource community. The tracking system anonymously collects non-sensitive and non-personal identifiable information about the running Mimir cluster, and is disabled by default. #2643 #2662 #2685 #2732 #2735 * [FEATURE] Introduced an experimental deployment mode called read-write and running a fully featured Mimir cluster with three components: write, read and backend. The read-write deployment mode is a trade-off between the monolithic mode (only one component, no isolation) and the microservices mode (many components, high isolation). #2754 * [FEATURE] Query-frontend: introduced experimental support to split instant queries by time. The instant query splitting can be enabled setting `-query-frontend.split-instant-queries-by-interval`. #2469 #2564 #2565 #2570 #2571 #2572 #2573 #2574 #2575 #2576 #2581 #2582 #2601 #2632 #2633 #2634 #2641 #2642 #2766 diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index 700f26711aa..bb92f71ecbc 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -8330,6 +8330,7 @@ "Host": "localhost:8080", "Path": "/alertmanager", "RawPath": "", + "OmitHost": false, "ForceQuery": false, "RawQuery": "", "Fragment": "", diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go index e8e702fd859..5215510c201 100644 --- a/pkg/ingester/ingester.go +++ b/pkg/ingester/ingester.go @@ -1560,7 +1560,7 @@ func (i *Ingester) createTSDB(userID string) (*userTSDB, error) { MaxExemplars: int64(maxExemplars), SeriesHashCache: i.seriesHashCache, EnableMemorySnapshotOnShutdown: i.cfg.BlocksStorageConfig.TSDB.MemorySnapshotOnShutdown, - IsolationDisabled: !i.cfg.BlocksStorageConfig.TSDB.IsolationEnabled, + IsolationDisabled: true, HeadChunksWriteQueueSize: i.cfg.BlocksStorageConfig.TSDB.HeadChunksWriteQueueSize, AllowOverlappingQueries: true, // We can have overlapping blocks from past or out-of-order enabled during runtime. AllowOverlappingCompaction: false, // always false since Mimir only uploads lvl 1 compacted blocks diff --git a/pkg/storage/tsdb/config.go b/pkg/storage/tsdb/config.go index 39e16b1df99..bb0d205c951 100644 --- a/pkg/storage/tsdb/config.go +++ b/pkg/storage/tsdb/config.go @@ -164,7 +164,6 @@ type TSDBConfig struct { CloseIdleTSDBTimeout time.Duration `yaml:"close_idle_tsdb_timeout" category:"advanced"` MemorySnapshotOnShutdown bool `yaml:"memory_snapshot_on_shutdown" category:"experimental"` HeadChunksWriteQueueSize int `yaml:"head_chunks_write_queue_size" category:"advanced"` - IsolationEnabled bool `yaml:"isolation_enabled" category:"advanced"` // TODO Remove in Mimir 2.3.0 // Series hash cache. SeriesHashCacheMaxBytes uint64 `yaml:"series_hash_cache_max_size_bytes" category:"advanced"` @@ -209,7 +208,6 @@ func (cfg *TSDBConfig) RegisterFlags(f *flag.FlagSet) { f.DurationVar(&cfg.CloseIdleTSDBTimeout, "blocks-storage.tsdb.close-idle-tsdb-timeout", 13*time.Hour, "If TSDB has not received any data for this duration, and all blocks from TSDB have been shipped, TSDB is closed and deleted from local disk. If set to positive value, this value should be equal or higher than -querier.query-ingesters-within flag to make sure that TSDB is not closed prematurely, which could cause partial query results. 0 or negative value disables closing of idle TSDB.") f.BoolVar(&cfg.MemorySnapshotOnShutdown, "blocks-storage.tsdb.memory-snapshot-on-shutdown", false, "True to enable snapshotting of in-memory TSDB data on disk when shutting down.") f.IntVar(&cfg.HeadChunksWriteQueueSize, "blocks-storage.tsdb.head-chunks-write-queue-size", 1000000, "The size of the write queue used by the head chunks mapper. Lower values reduce memory utilisation at the cost of potentially higher ingest latency. Value of 0 switches chunks mapper to implementation without a queue.") - f.BoolVar(&cfg.IsolationEnabled, "blocks-storage.tsdb.isolation-enabled", false, "[Deprecated] Enables TSDB isolation feature. Disabling may improve performance.") f.IntVar(&cfg.OutOfOrderCapacityMin, "blocks-storage.tsdb.out-of-order-capacity-min", 4, "Minimum capacity for out-of-order chunks, in samples between 0 and 255.") f.IntVar(&cfg.OutOfOrderCapacityMax, "blocks-storage.tsdb.out-of-order-capacity-max", 32, "Maximum capacity for out of order chunks, in samples between 1 and 255.") } From 641b966c4f39660ace7fe628fae8594e36817f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= Date: Fri, 19 Aug 2022 16:55:25 +0200 Subject: [PATCH 2/5] Added PR number. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Štibraný --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc8241f7a3b..24bad55f3d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ * [CHANGE] Distributor: if forwarding rules are used to forward samples, exemplars are now removed from the request. #2710 #2725 * [CHANGE] Limits: change the default value of `max_global_series_per_metric` limit to `0` (disabled). Setting this limit by default does not provide much benefit because series are sharded by all labels. #2714 * [CHANGE] Ingester: experimental `-blocks-storage.tsdb.new-chunk-disk-mapper` has been removed, new chunk disk mapper is now always used, and is no longer marked experimental. Default value of `-blocks-storage.tsdb.head-chunks-write-queue-size` has changed to 1000000, this enables async chunk queue by default. Default value of `-blocks-storage.tsdb.head-chunks-write-queue-size` has changed to 1000000, this enables async chunk queue by default, which leads to improved latency on the write path when new chunks are created in ingesters. #2762 -* [CHANGE] Ingester: removed deprecated `-blocks-storage.tsdb.isolation-enabled` option. TSDB-level isolation is now always disabled in Mimir. +* [CHANGE] Ingester: removed deprecated `-blocks-storage.tsdb.isolation-enabled` option. TSDB-level isolation is now always disabled in Mimir. #2782 * [FEATURE] Introduced an experimental anonymous usage statistics tracking (disabled by default), to help Mimir maintainers driving better decisions to support the opensource community. The tracking system anonymously collects non-sensitive and non-personal identifiable information about the running Mimir cluster, and is disabled by default. #2643 #2662 #2685 #2732 #2735 * [FEATURE] Introduced an experimental deployment mode called read-write and running a fully featured Mimir cluster with three components: write, read and backend. The read-write deployment mode is a trade-off between the monolithic mode (only one component, no isolation) and the microservices mode (many components, high isolation). #2754 * [FEATURE] Query-frontend: introduced experimental support to split instant queries by time. The instant query splitting can be enabled setting `-query-frontend.split-instant-queries-by-interval`. #2469 #2564 #2565 #2570 #2571 #2572 #2573 #2574 #2575 #2576 #2581 #2582 #2601 #2632 #2633 #2634 #2641 #2642 #2766 From d5977b2681293de7359274403b6f17eb4d090bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= Date: Fri, 19 Aug 2022 17:22:37 +0200 Subject: [PATCH 3/5] docs --- cmd/mimir/config-descriptor.json | 12 ------------ cmd/mimir/help-all.txt.tmpl | 2 -- .../reference-configuration-parameters/index.md | 5 ----- 3 files changed, 19 deletions(-) diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index bb92f71ecbc..c063e652995 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -5446,17 +5446,6 @@ "fieldType": "int", "fieldCategory": "advanced" }, - { - "kind": "field", - "name": "isolation_enabled", - "required": false, - "desc": "[Deprecated] Enables TSDB isolation feature. Disabling may improve performance.", - "fieldValue": null, - "fieldDefaultValue": false, - "fieldFlag": "blocks-storage.tsdb.isolation-enabled", - "fieldType": "boolean", - "fieldCategory": "advanced" - }, { "kind": "field", "name": "series_hash_cache_max_size_bytes", @@ -8330,7 +8319,6 @@ "Host": "localhost:8080", "Path": "/alertmanager", "RawPath": "", - "OmitHost": false, "ForceQuery": false, "RawQuery": "", "Fragment": "", diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index 0c4a9b03a3b..6c19ec551e8 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -499,8 +499,6 @@ Usage of ./cmd/mimir/mimir: If TSDB head is idle for this duration, it is compacted. Note that up to 25% jitter is added to the value to avoid ingesters compacting concurrently. 0 means disabled. (default 1h0m0s) -blocks-storage.tsdb.head-compaction-interval duration How frequently ingesters try to compact TSDB head. Block is only created if data covers smallest block range. Must be greater than 0 and max 5 minutes. (default 1m0s) - -blocks-storage.tsdb.isolation-enabled - [Deprecated] Enables TSDB isolation feature. Disabling may improve performance. -blocks-storage.tsdb.max-tsdb-opening-concurrency-on-startup int limit the number of concurrently opening TSDB's on startup (default 10) -blocks-storage.tsdb.memory-snapshot-on-shutdown diff --git a/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md b/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md index 0ec98e03b70..1af34ca5892 100644 --- a/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md +++ b/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md @@ -3022,11 +3022,6 @@ tsdb: # CLI flag: -blocks-storage.tsdb.head-chunks-write-queue-size [head_chunks_write_queue_size: | default = 1000000] - # (advanced) [Deprecated] Enables TSDB isolation feature. Disabling may - # improve performance. - # CLI flag: -blocks-storage.tsdb.isolation-enabled - [isolation_enabled: | default = false] - # (advanced) Max size - in bytes - of the in-memory series hash cache. The # cache is shared across all tenants and it's used only when query sharding is # enabled. From 431ddc6306d47e03fb3a90cbd09ed96e3a752b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= Date: Fri, 19 Aug 2022 17:38:01 +0200 Subject: [PATCH 4/5] Update about-versioning.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Štibraný --- docs/sources/operators-guide/configure/about-versioning.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/sources/operators-guide/configure/about-versioning.md b/docs/sources/operators-guide/configure/about-versioning.md index 97bbb55d26b..2bc0a9d3e06 100644 --- a/docs/sources/operators-guide/configure/about-versioning.md +++ b/docs/sources/operators-guide/configure/about-versioning.md @@ -104,5 +104,4 @@ The following features are currently experimental: The following features are currently deprecated: - Ingester: - - `-blocks-storage.tsdb.isolation-enabled` CLI flag and `isolation_enabled` YAML config parameter. This will be removed in version 2.3.0. - `active_series_custom_trackers` YAML config parameter in the ingester block. The configuration has been moved to limit config, the ingester config will be removed in version 2.3.0. From 1bbecd67eca31fa38ed3d4d85b1f48936816fbde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= Date: Fri, 19 Aug 2022 17:38:27 +0200 Subject: [PATCH 5/5] Update about-versioning.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Štibraný --- docs/sources/operators-guide/configure/about-versioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/operators-guide/configure/about-versioning.md b/docs/sources/operators-guide/configure/about-versioning.md index 2bc0a9d3e06..17b97ac2e22 100644 --- a/docs/sources/operators-guide/configure/about-versioning.md +++ b/docs/sources/operators-guide/configure/about-versioning.md @@ -104,4 +104,4 @@ The following features are currently experimental: The following features are currently deprecated: - Ingester: - - `active_series_custom_trackers` YAML config parameter in the ingester block. The configuration has been moved to limit config, the ingester config will be removed in version 2.3.0. + - `active_series_custom_trackers` YAML config parameter in the ingester block. The configuration has been moved to limit config, the ingester config will be removed in version 2.4.0.