Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/tempo/app/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ func (t *App) initQuerier() (services.Service, error) {
ingesterRings,
t.cfg.GeneratorClient,
t.readRings[ringMetricsGenerator],
t.cfg.PartitionRingLiveStore,
t.cfg.Querier.QueryLiveStore,
t.cfg.LiveStoreClient,
t.readRings[ringLiveStore],
t.partitionRing,
Expand Down
3 changes: 2 additions & 1 deletion example/docker-compose/ingest-storage/tempo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ compactor:
querier:
frontend_worker:
frontend_address: query-frontend:9095
query_live_store: true

metrics_generator:
registry:
Expand Down Expand Up @@ -96,4 +97,4 @@ block_builder:
block-builder-1: [1]

usage_report:
reporting_enabled: false
reporting_enabled: false
3 changes: 3 additions & 0 deletions example/tk/tempo-microservices/main.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ minio + metrics + load + kafka + tempo {
topic: 'tempo-ingest',
},
},
querier+: {
query_live_store: true,
},
block_builder+: {
consume_cycle_duration: '30s',
assigned_partitions: {
Expand Down
1 change: 1 addition & 0 deletions integration/e2e/ingest/config-live-store.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,4 @@ ingest:
querier:
frontend_worker:
frontend_address: query-frontend:9095
query_live_store: true
2 changes: 2 additions & 0 deletions modules/querier/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type Config struct {
ShuffleShardingIngestersLookbackPeriod time.Duration `yaml:"shuffle_sharding_ingesters_lookback_period"`
QueryRelevantIngesters bool `yaml:"query_relevant_ingesters"`
SecondaryIngesterRing string `yaml:"secondary_ingester_ring,omitempty"`
QueryLiveStore bool `yaml:"query_live_store,omitempty"` // todo: remove after rhythm migration
}

type SearchConfig struct {
Expand Down Expand Up @@ -81,6 +82,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet)
cfg.PartitionRing.MinimizeRequests = true
cfg.PartitionRing.MinimizeRequestsHedgingDelay = 3 * time.Second
cfg.PartitionRing.PreferredZone = ""
cfg.QueryLiveStore = false

f.StringVar(&cfg.Worker.FrontendAddress, prefix+".frontend-address", "", "Address of query frontend service, in host:port format.")
}
4 changes: 3 additions & 1 deletion modules/querier/querier.go
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,9 @@ func (q *Querier) forGivenGenerators(ctx context.Context, f forEachGeneratorFn)
ctx, span := tracer.Start(ctx, "Querier.forGivenGenerators")
defer span.End()

if q.queryPartitionRing {
recentDataTarget := extractRecentDataTarget(ctx)

if q.queryPartitionRing || recentDataTarget == "live-store" {
rs, err := q.partitionRing.GetReplicationSetsForOperation(ring.Read)
if err != nil {
return nil, fmt.Errorf("error finding partition ring replicas: %w", err)
Expand Down
Loading