From 876169d57d958a1493bdf6b974cad8249f35c388 Mon Sep 17 00:00:00 2001 From: alanprot Date: Thu, 14 Jul 2022 20:03:16 +0000 Subject: [PATCH] Docs Signed-off-by: alanprot --- docs/blocks-storage/compactor.md | 5 +++++ docs/configuration/config-file-reference.md | 5 +++++ pkg/compactor/compactor.go | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/blocks-storage/compactor.md b/docs/blocks-storage/compactor.md index e1aaaf44cb..6156b0edd1 100644 --- a/docs/blocks-storage/compactor.md +++ b/docs/blocks-storage/compactor.md @@ -157,6 +157,11 @@ compactor: # CLI flag: -compactor.block-files-concurrency [block_files_concurrency: | default = 10] + # Number of goroutines to use when fetching blocks from object storage when + # compacting. + # CLI flag: -compactor.blocks-fetch-concurrency + [blocks_fetch_concurrency: | default = 3] + # When enabled, at compactor startup the bucket will be scanned and all found # deletion marks inside the block location will be copied to the markers # global location too. This option can (and should) be safely disabled as soon diff --git a/docs/configuration/config-file-reference.md b/docs/configuration/config-file-reference.md index 0fc0f54b97..f15c69e05b 100644 --- a/docs/configuration/config-file-reference.md +++ b/docs/configuration/config-file-reference.md @@ -5322,6 +5322,11 @@ The `compactor_config` configures the compactor for the blocks storage. # CLI flag: -compactor.block-files-concurrency [block_files_concurrency: | default = 10] +# Number of goroutines to use when fetching blocks from object storage when +# compacting. +# CLI flag: -compactor.blocks-fetch-concurrency +[blocks_fetch_concurrency: | default = 3] + # When enabled, at compactor startup the bucket will be scanned and all found # deletion marks inside the block location will be copied to the markers global # location too. This option can (and should) be safely disabled as soon as the diff --git a/pkg/compactor/compactor.go b/pkg/compactor/compactor.go index ba2dae703a..f6a208591f 100644 --- a/pkg/compactor/compactor.go +++ b/pkg/compactor/compactor.go @@ -219,7 +219,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) { f.BoolVar(&cfg.BlockDeletionMarksMigrationEnabled, "compactor.block-deletion-marks-migration-enabled", false, "When enabled, at compactor startup the bucket will be scanned and all found deletion marks inside the block location will be copied to the markers global location too. This option can (and should) be safely disabled as soon as the compactor has successfully run at least once.") f.BoolVar(&cfg.SkipBlocksWithOutOfOrderChunksEnabled, "compactor.skip-blocks-with-out-of-order-chunks-enabled", false, "When enabled, mark blocks containing index with out-of-order chunks for no compact instead of halting the compaction.") f.IntVar(&cfg.BlockFilesConcurrency, "compactor.block-files-concurrency", 10, "Number of goroutines to use when fetching/uploading block files from object storage.") - f.IntVar(&cfg.BlocksFetchConcurrency, "compactor.blocks-fetch-concurrency", 10, "Number of goroutines to use when fetching blocks from object storage when compacting.") + f.IntVar(&cfg.BlocksFetchConcurrency, "compactor.blocks-fetch-concurrency", 3, "Number of goroutines to use when fetching blocks from object storage when compacting.") f.Var(&cfg.EnabledTenants, "compactor.enabled-tenants", "Comma separated list of tenants that can be compacted. If specified, only these tenants will be compacted by compactor, otherwise all tenants can be compacted. Subject to sharding.") f.Var(&cfg.DisabledTenants, "compactor.disabled-tenants", "Comma separated list of tenants that cannot be compacted by this compactor. If specified, and compactor would normally pick given tenant for compaction (via -compactor.enabled-tenants or sharding), it will be ignored instead.")