From 285e9254b62fd35be89cdefc2199b47ba4025dfd Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Thu, 21 Jan 2021 12:15:20 +0100 Subject: [PATCH 1/2] Changed default value of -blocks-storage.bucket-store.sync-interval form 5m to 15m Signed-off-by: Marco Pracucci --- CHANGELOG.md | 1 + docs/blocks-storage/querier.md | 2 +- docs/blocks-storage/store-gateway.md | 2 +- docs/configuration/config-file-reference.md | 2 +- pkg/storage/tsdb/config.go | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fd5bc51a6d..ae6efac8ecb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ * `-cluster.advertise-address` in favor of `-alertmanager.cluster.advertise-address` * `-cluster.peer` in favor of `-alertmanager.cluster.peers` * `-cluster.peer-timeout` in favor of `-alertmanager.cluster.peer-timeout` +* [CHANGE] Blocks storage: the default value of `-blocks-storage.bucket-store.sync-interval` has been changed from `5m` to `15m`. This has been made to match with `-compactor.cleanup-interval` default setting (`15m`), which is recommended when running the blocks storage with the bucket index enabled. #3724 * [FEATURE] Querier: Queries can be federated across multiple tenants. The tenants IDs involved need to be specified separated by a `|` character in the `X-Scope-OrgID` request header. This is an experimental feature, which can be enabled by setting `-tenant-federation.enabled=true` on all Cortex services. #3250 * [FEATURE] Alertmanager: introduced the experimental option `-alertmanager.sharding-enabled` to shard tenants across multiple Alertmanager instances. This feature is still under heavy development and its usage is discouraged. The following new metrics are exported by the Alertmanager: #3664 * `cortex_alertmanager_ring_check_errors_total` diff --git a/docs/blocks-storage/querier.md b/docs/blocks-storage/querier.md index e1bfd283781..5e6351b5a78 100644 --- a/docs/blocks-storage/querier.md +++ b/docs/blocks-storage/querier.md @@ -387,7 +387,7 @@ blocks_storage: # enabled), in order to look for changes (new blocks shipped by ingesters # and blocks deleted by retention or compaction). # CLI flag: -blocks-storage.bucket-store.sync-interval - [sync_interval: | default = 5m] + [sync_interval: | default = 15m] # Max size - in bytes - of a per-tenant chunk pool, used to reduce memory # allocations. diff --git a/docs/blocks-storage/store-gateway.md b/docs/blocks-storage/store-gateway.md index fb873f1b07e..32961dd9de4 100644 --- a/docs/blocks-storage/store-gateway.md +++ b/docs/blocks-storage/store-gateway.md @@ -434,7 +434,7 @@ blocks_storage: # enabled), in order to look for changes (new blocks shipped by ingesters # and blocks deleted by retention or compaction). # CLI flag: -blocks-storage.bucket-store.sync-interval - [sync_interval: | default = 5m] + [sync_interval: | default = 15m] # Max size - in bytes - of a per-tenant chunk pool, used to reduce memory # allocations. diff --git a/docs/configuration/config-file-reference.md b/docs/configuration/config-file-reference.md index cdee3edc540..d0754cf38b2 100644 --- a/docs/configuration/config-file-reference.md +++ b/docs/configuration/config-file-reference.md @@ -3799,7 +3799,7 @@ bucket_store: # enabled), in order to look for changes (new blocks shipped by ingesters and # blocks deleted by retention or compaction). # CLI flag: -blocks-storage.bucket-store.sync-interval - [sync_interval: | default = 5m] + [sync_interval: | default = 15m] # Max size - in bytes - of a per-tenant chunk pool, used to reduce memory # allocations. diff --git a/pkg/storage/tsdb/config.go b/pkg/storage/tsdb/config.go index 0c6920575b9..eaf1e614059 100644 --- a/pkg/storage/tsdb/config.go +++ b/pkg/storage/tsdb/config.go @@ -243,7 +243,7 @@ func (cfg *BucketStoreConfig) RegisterFlags(f *flag.FlagSet) { cfg.BucketIndex.RegisterFlagsWithPrefix(f, "blocks-storage.bucket-store.bucket-index.") f.StringVar(&cfg.SyncDir, "blocks-storage.bucket-store.sync-dir", "tsdb-sync", "Directory to store synchronized TSDB index headers.") - f.DurationVar(&cfg.SyncInterval, "blocks-storage.bucket-store.sync-interval", 5*time.Minute, "How frequently to scan the bucket, or to refresh the bucket index (if enabled), in order to look for changes (new blocks shipped by ingesters and blocks deleted by retention or compaction).") + f.DurationVar(&cfg.SyncInterval, "blocks-storage.bucket-store.sync-interval", 15*time.Minute, "How frequently to scan the bucket, or to refresh the bucket index (if enabled), in order to look for changes (new blocks shipped by ingesters and blocks deleted by retention or compaction).") f.Uint64Var(&cfg.MaxChunkPoolBytes, "blocks-storage.bucket-store.max-chunk-pool-bytes", uint64(2*units.Gibibyte), "Max size - in bytes - of a per-tenant chunk pool, used to reduce memory allocations.") f.IntVar(&cfg.MaxConcurrent, "blocks-storage.bucket-store.max-concurrent", 100, "Max number of concurrent queries to execute against the long-term storage. The limit is shared across all tenants.") f.IntVar(&cfg.TenantSyncConcurrency, "blocks-storage.bucket-store.tenant-sync-concurrency", 10, "Maximum number of concurrent tenants synching blocks.") From bd97858c9e449ae00d5c71b851780bc43362ead3 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Thu, 21 Jan 2021 12:20:06 +0100 Subject: [PATCH 2/2] Updated CHANGELOG entry Signed-off-by: Marco Pracucci --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae6efac8ecb..96837e1df59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ * `-cluster.advertise-address` in favor of `-alertmanager.cluster.advertise-address` * `-cluster.peer` in favor of `-alertmanager.cluster.peers` * `-cluster.peer-timeout` in favor of `-alertmanager.cluster.peer-timeout` -* [CHANGE] Blocks storage: the default value of `-blocks-storage.bucket-store.sync-interval` has been changed from `5m` to `15m`. This has been made to match with `-compactor.cleanup-interval` default setting (`15m`), which is recommended when running the blocks storage with the bucket index enabled. #3724 +* [CHANGE] Blocks storage: the default value of `-blocks-storage.bucket-store.sync-interval` has been changed from `5m` to `15m`. #3724 * [FEATURE] Querier: Queries can be federated across multiple tenants. The tenants IDs involved need to be specified separated by a `|` character in the `X-Scope-OrgID` request header. This is an experimental feature, which can be enabled by setting `-tenant-federation.enabled=true` on all Cortex services. #3250 * [FEATURE] Alertmanager: introduced the experimental option `-alertmanager.sharding-enabled` to shard tenants across multiple Alertmanager instances. This feature is still under heavy development and its usage is discouraged. The following new metrics are exported by the Alertmanager: #3664 * `cortex_alertmanager_ring_check_errors_total`