Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport #9213 to r306 #9214

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Backport #9213 to r306 #9214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
* [ENHANCEMENT] Update runtime configuration to read gzip-compressed files with `.gz` extension. #9074
* [ENHANCEMENT] Ingester: add `cortex_lifecycler_read_only` metric which is set to 1 when ingester's lifecycler is set to read-only mode. #9095
* [ENHANCEMENT] Add a new field, `encode_time_seconds` to query stats log messages, to record the amount of time it takes the query-frontend to encode a response. This does not include any serialization time for downstream components. #9062
* [ENHANCEMENT] Querier: attach logs emitted during query consistency check to trace span for query. #9213
* [BUGFIX] Ruler: add support for draining any outstanding alert notifications before shutting down. This can be enabled with the `-ruler.drain-notification-queue-on-shutdown=true` CLI flag. #8346
* [BUGFIX] Query-frontend: fix `-querier.max-query-lookback` enforcement when `-compactor.blocks-retention-period` is not set, and viceversa. #8388
* [BUGFIX] Ingester: fix sporadic `not found` error causing an internal server error if label names are queried with matchers during head compaction. #8391
Expand Down
10 changes: 4 additions & 6 deletions pkg/querier/blocks_consistency_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,15 @@ import (
type BlocksConsistency struct {
uploadGracePeriod time.Duration
deletionGracePeriod time.Duration
logger log.Logger

checksTotal prometheus.Counter
checksFailed prometheus.Counter
}

func NewBlocksConsistency(uploadGracePeriod, deletionGracePeriod time.Duration, logger log.Logger, reg prometheus.Registerer) *BlocksConsistency {
func NewBlocksConsistency(uploadGracePeriod, deletionGracePeriod time.Duration, reg prometheus.Registerer) *BlocksConsistency {
return &BlocksConsistency{
uploadGracePeriod: uploadGracePeriod,
deletionGracePeriod: deletionGracePeriod,
logger: logger,
checksTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
Name: "cortex_querier_blocks_consistency_checks_total",
Help: "Total number of queries that needed to run with consistency checks. A consistency check is required when querying blocks from store-gateways to make sure that all blocks are queried.",
Expand All @@ -44,7 +42,7 @@ func NewBlocksConsistency(uploadGracePeriod, deletionGracePeriod time.Duration,

// NewTracker creates a consistency tracker from the known blocks. It filters out any block uploaded within uploadGracePeriod
// and with a deletion mark within deletionGracePeriod.
func (c *BlocksConsistency) NewTracker(knownBlocks bucketindex.Blocks, knownDeletionMarks map[ulid.ULID]*bucketindex.BlockDeletionMark) BlocksConsistencyTracker {
func (c *BlocksConsistency) NewTracker(knownBlocks bucketindex.Blocks, knownDeletionMarks map[ulid.ULID]*bucketindex.BlockDeletionMark, logger log.Logger) BlocksConsistencyTracker {
blocksToTrack := make(map[ulid.ULID]struct{}, len(knownBlocks))
for _, block := range knownBlocks {
// Some recently uploaded blocks, already discovered by the querier, may not have been discovered
Expand All @@ -55,7 +53,7 @@ func (c *BlocksConsistency) NewTracker(knownBlocks bucketindex.Blocks, knownDele
// - Blocks uploaded by compactor: the source blocks are marked for deletion but will continue to be
// queried by queriers for a while (depends on the configured deletion marks delay).
if c.uploadGracePeriod > 0 && time.Since(block.GetUploadedAt()) < c.uploadGracePeriod {
level.Debug(c.logger).Log("msg", "block skipped from consistency check because it was uploaded recently", "block", block.ID.String(), "uploadedAt", block.GetUploadedAt().String())
level.Debug(logger).Log("msg", "block skipped from consistency check because it was uploaded recently", "block", block.ID.String(), "uploadedAt", block.GetUploadedAt().String())
continue
}

Expand All @@ -67,7 +65,7 @@ func (c *BlocksConsistency) NewTracker(knownBlocks bucketindex.Blocks, knownDele
deletionTime := time.Unix(mark.DeletionTime, 0)

if c.deletionGracePeriod > 0 && time.Since(deletionTime) > c.deletionGracePeriod {
level.Debug(c.logger).Log("msg", "block skipped from consistency check because it is marked for deletion", "block", block.ID.String(), "deletionTime", deletionTime.String())
level.Debug(logger).Log("msg", "block skipped from consistency check because it is marked for deletion", "block", block.ID.String(), "deletionTime", deletionTime.String())
continue
}
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/querier/blocks_consistency_checker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ func TestBlocksConsistencyTracker_Check(t *testing.T) {
for testName, testData := range tests {
t.Run(testName, func(t *testing.T) {
reg := prometheus.NewPedanticRegistry()
c := NewBlocksConsistency(uploadGracePeriod, deletionGracePeriod, log.NewNopLogger(), reg)
tracker := c.NewTracker(testData.knownBlocks, testData.knownDeletionMarks)
c := NewBlocksConsistency(uploadGracePeriod, deletionGracePeriod, reg)
tracker := c.NewTracker(testData.knownBlocks, testData.knownDeletionMarks, log.NewNopLogger())
var missingBlocks []ulid.ULID
for _, queriedBlocksAttempt := range testData.queriedBlocks {
missingBlocks = tracker.Check(queriedBlocksAttempt)
Expand Down
3 changes: 1 addition & 2 deletions pkg/querier/blocks_store_queryable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ func NewBlocksStoreQueryableFromConfig(querierCfg Config, gatewayCfg storegatewa
// recently marked for deletion, until the "ignore delay / 2". This means the consistency checker
// exclude such blocks about 50% of the time before querier and store-gateway stops querying them.
storageCfg.BucketStore.IgnoreDeletionMarksDelay/2,
logger,
reg,
)

Expand Down Expand Up @@ -548,7 +547,7 @@ func (q *blocksStoreQuerier) queryWithConsistencyCheck(
touchedStores = map[string]struct{}{}
)

consistencyTracker := q.consistency.NewTracker(knownBlocks, knownDeletionMarks)
consistencyTracker := q.consistency.NewTracker(knownBlocks, knownDeletionMarks, spanLog)
defer func() {
// Do not track consistency check metrics if query failed with an error unrelated to consistency check (e.g. context canceled),
// because it means we interrupted the requests, and we don't know whether consistency check would have succeeded
Expand Down
16 changes: 8 additions & 8 deletions pkg/querier/blocks_store_queryable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,7 +1563,7 @@ func TestBlocksStoreQuerier_Select(t *testing.T) {
maxT: maxT,
finder: finder,
stores: stores,
consistency: NewBlocksConsistency(0, 0, log.NewNopLogger(), reg),
consistency: NewBlocksConsistency(0, 0, reg),
logger: log.NewNopLogger(),
metrics: newBlocksStoreQueryableMetrics(reg),
limits: testData.limits,
Expand Down Expand Up @@ -1704,7 +1704,7 @@ func TestBlocksStoreQuerier_ShouldReturnContextCanceledIfContextWasCanceledWhile
maxT: maxT,
finder: finder,
stores: stores,
consistency: NewBlocksConsistency(0, 0, logger, reg),
consistency: NewBlocksConsistency(0, 0, reg),
logger: logger,
metrics: newBlocksStoreQueryableMetrics(reg),
limits: &blocksStoreLimitsMock{},
Expand Down Expand Up @@ -1932,7 +1932,7 @@ func TestBlocksStoreQuerier_Select_cancelledContext(t *testing.T) {
maxT: maxT,
finder: finder,
stores: stores,
consistency: NewBlocksConsistency(0, 0, log.NewNopLogger(), nil),
consistency: NewBlocksConsistency(0, 0, nil),
logger: log.NewNopLogger(),
metrics: newBlocksStoreQueryableMetrics(reg),
limits: &blocksStoreLimitsMock{},
Expand Down Expand Up @@ -2435,7 +2435,7 @@ func TestBlocksStoreQuerier_Labels(t *testing.T) {
maxT: maxT,
finder: finder,
stores: stores,
consistency: NewBlocksConsistency(0, 0, log.NewNopLogger(), nil),
consistency: NewBlocksConsistency(0, 0, nil),
logger: log.NewNopLogger(),
metrics: newBlocksStoreQueryableMetrics(reg),
limits: &blocksStoreLimitsMock{},
Expand Down Expand Up @@ -2506,7 +2506,7 @@ func TestBlocksStoreQuerier_Labels(t *testing.T) {
maxT: maxT,
finder: finder,
stores: stores,
consistency: NewBlocksConsistency(0, 0, log.NewNopLogger(), nil),
consistency: NewBlocksConsistency(0, 0, nil),
logger: log.NewNopLogger(),
metrics: newBlocksStoreQueryableMetrics(reg),
limits: &blocksStoreLimitsMock{},
Expand Down Expand Up @@ -2580,7 +2580,7 @@ func TestBlocksStoreQuerier_SelectSortedShouldHonorQueryStoreAfter(t *testing.T)
maxT: testData.queryMaxT,
finder: finder,
stores: &blocksStoreSetMock{},
consistency: NewBlocksConsistency(0, 0, log.NewNopLogger(), nil),
consistency: NewBlocksConsistency(0, 0, nil),
logger: log.NewNopLogger(),
metrics: newBlocksStoreQueryableMetrics(nil),
limits: &blocksStoreLimitsMock{},
Expand Down Expand Up @@ -2683,7 +2683,7 @@ func TestBlocksStoreQuerier_MaxLabelsQueryRange(t *testing.T) {
maxT: testData.queryMaxT,
finder: finder,
stores: &blocksStoreSetMock{},
consistency: NewBlocksConsistency(0, 0, log.NewNopLogger(), nil),
consistency: NewBlocksConsistency(0, 0, nil),
logger: log.NewNopLogger(),
metrics: newBlocksStoreQueryableMetrics(nil),
limits: &blocksStoreLimitsMock{
Expand Down Expand Up @@ -2824,7 +2824,7 @@ func TestBlocksStoreQuerier_PromQLExecution(t *testing.T) {

// Instantiate the querier that will be executed to run the query.
logger := log.NewNopLogger()
queryable, err := NewBlocksStoreQueryable(stores, finder, NewBlocksConsistency(0, 0, logger, nil), &blocksStoreLimitsMock{}, 0, 0, logger, nil)
queryable, err := NewBlocksStoreQueryable(stores, finder, NewBlocksConsistency(0, 0, nil), &blocksStoreLimitsMock{}, 0, 0, logger, nil)
require.NoError(t, err)
require.NoError(t, services.StartAndAwaitRunning(context.Background(), queryable))
defer services.StopAndAwaitTerminated(context.Background(), queryable) // nolint:errcheck
Expand Down
Loading