diff --git a/docs/sources/configure/_index.md b/docs/sources/configure/_index.md index c1ad2e29eff9..158bca6c0058 100644 --- a/docs/sources/configure/_index.md +++ b/docs/sources/configure/_index.md @@ -1915,11 +1915,6 @@ client: # bloom-gateway-client.grpc [grpc_client_config: ] - # Flag to control whether requests sent to the gateway should be logged or - # not. - # CLI flag: -bloom-gateway-client.log-gateway-requests - [log_gateway_requests: | default = false] - results_cache: # The cache block configures the cache backend. # The CLI flags prefix for this block configuration is: @@ -2370,7 +2365,7 @@ bloom_shipper: blocks_downloading_queue: # The count of parallel workers that download Bloom Blocks. # CLI flag: -bloom.shipper.blocks-downloading-queue.workers-count - [workers_count: | default = 100] + [workers_count: | default = 16] # Maximum number of task in queue per tenant per bloom-gateway. Enqueuing # the tasks above this limit will fail an error. diff --git a/pkg/bloomgateway/cache.go b/pkg/bloomgateway/cache.go index 6c573cb47d6d..aec04333368d 100644 --- a/pkg/bloomgateway/cache.go +++ b/pkg/bloomgateway/cache.go @@ -46,6 +46,7 @@ func newCacheKeyGen(limits CacheLimits) keyGen { return keyGen{limits} } +// TODO(owen-d): need to implement our own key-generation which accounts for fingerprint ranges requested. func (k keyGen) GenerateCacheKey(ctx context.Context, tenant string, r resultscache.Request) string { return resultscache.ConstSplitter(k.BloomGatewayCacheKeyInterval(tenant)).GenerateCacheKey(ctx, tenant, r) } diff --git a/pkg/bloomgateway/client.go b/pkg/bloomgateway/client.go index 05eae0360952..f08397693f86 100644 --- a/pkg/bloomgateway/client.go +++ b/pkg/bloomgateway/client.go @@ -56,9 +56,6 @@ var ( } }, } - - // NB(chaudum): Should probably be configurable, but I don't want yet another user setting. - maxQueryParallelism = 10 ) type ringGetBuffers struct { @@ -107,10 +104,6 @@ type ClientConfig struct { // GRPCClientConfig configures the gRPC connection between the Bloom Gateway client and the server. GRPCClientConfig grpcclient.Config `yaml:"grpc_client_config"` - // LogGatewayRequests configures if requests sent to the gateway should be logged or not. - // The log messages are of type debug and contain the address of the gateway and the relevant tenant. - LogGatewayRequests bool `yaml:"log_gateway_requests"` - // Ring is the Bloom Gateway ring used to find the appropriate Bloom Gateway instance // this client should talk to. Ring ring.ReadRing `yaml:"-"` @@ -130,7 +123,6 @@ func (i *ClientConfig) RegisterFlagsWithPrefix(prefix string, f *flag.FlagSet) { i.GRPCClientConfig.RegisterFlagsWithPrefix(prefix+"grpc", f) i.Cache.RegisterFlagsWithPrefix(prefix+"cache.", f) f.BoolVar(&i.CacheResults, prefix+"cache_results", false, "Flag to control whether to cache bloom gateway client requests/responses.") - f.BoolVar(&i.LogGatewayRequests, prefix+"log-gateway-requests", false, "Flag to control whether requests sent to the gateway should be logged or not.") } func (i *ClientConfig) Validate() error { @@ -258,7 +250,7 @@ func (c *GatewayClient) FilterChunks(ctx context.Context, tenant string, from, t results := make([][]*logproto.GroupedChunkRefs, len(servers)) count := 0 - err = concurrency.ForEachJob(ctx, len(servers), maxQueryParallelism, func(ctx context.Context, i int) error { + err = concurrency.ForEachJob(ctx, len(servers), len(servers), func(ctx context.Context, i int) error { rs := servers[i] // randomize order of addresses so we don't hotspot the first server in the list diff --git a/pkg/bloomgateway/stats.go b/pkg/bloomgateway/stats.go index bc7373d4d653..a855547b9124 100644 --- a/pkg/bloomgateway/stats.go +++ b/pkg/bloomgateway/stats.go @@ -53,6 +53,7 @@ func (s *Stats) KVArgs() []any { filterRatio := float64(s.ChunksFiltered) / float64(max(s.ChunksRequested, 1)) return []any{ + "msg", "stats-report", "status", s.Status, "tasks", s.NumTasks, "series_requested", s.SeriesRequested, diff --git a/pkg/storage/stores/shipper/bloomshipper/config/config.go b/pkg/storage/stores/shipper/bloomshipper/config/config.go index eda55e8fbbeb..791c97bfe1e4 100644 --- a/pkg/storage/stores/shipper/bloomshipper/config/config.go +++ b/pkg/storage/stores/shipper/bloomshipper/config/config.go @@ -26,7 +26,7 @@ type DownloadingQueueConfig struct { } func (cfg *DownloadingQueueConfig) RegisterFlagsWithPrefix(prefix string, f *flag.FlagSet) { - f.IntVar(&cfg.WorkersCount, prefix+"workers-count", 100, "The count of parallel workers that download Bloom Blocks.") + f.IntVar(&cfg.WorkersCount, prefix+"workers-count", 16, "The count of parallel workers that download Bloom Blocks.") f.IntVar(&cfg.MaxTasksEnqueuedPerTenant, prefix+"max_tasks_enqueued_per_tenant", 10_000, "Maximum number of task in queue per tenant per bloom-gateway. Enqueuing the tasks above this limit will fail an error.") }