Skip to content

Fix flaky timing-sensitive tests in blocks_store_queryable #7470

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

Merged
friedrichg merged 1 commit into from
May 2, 2026
Merged

Fix flaky timing-sensitive tests in blocks_store_queryable #7470

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
5 changes: 4 additions & 1 deletion pkg/querier/blocks_store_queryable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ func (q *BlocksStoreQueryable) Querier(mint, maxt int64) (storage.Querier, error
storeGatewayQueryStatsEnabled: q.storeGatewayQueryStatsEnabled,
storeGatewayConsistencyCheckMaxAttempts: q.storeGatewayConsistencyCheckMaxAttempts,
storeGatewaySeriesBatchSize: q.storeGatewaySeriesBatchSize,
nowFn: time.Now,
}, nil
}

Expand All @@ -328,6 +329,8 @@ type blocksStoreQuerier struct {

// The maximum number of series to be batched in a single gRPC response message from Store Gateways.
storeGatewaySeriesBatchSize int64

nowFn func() time.Time
}

// Select implements storage.Querier interface.
Expand Down Expand Up @@ -492,7 +495,7 @@ func (q *blocksStoreQuerier) queryWithConsistencyCheck(ctx context.Context, logg
// optimization is particularly important for the blocks storage because can be used to skip
// querying most recent not-compacted-yet blocks from the storage.
if queryStoreAfter > 0 {
now := time.Now()
now := q.nowFn()
origMaxT := maxT
maxT = min(maxT, util.TimeToMillis(now.Add(-queryStoreAfter)))

Expand Down
15 changes: 6 additions & 9 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 @@ -2432,6 +2432,7 @@ func TestBlocksStoreQuerier_SelectSortedShouldHonorQueryStoreAfter(t *testing.T)
logger: log.NewNopLogger(),
metrics: newBlocksStoreQueryableMetrics(nil),
limits: &blocksStoreLimitsMock{queryStoreAfter: testData.queryStoreAfter},
nowFn: func() time.Time { return now },
}

sp := &storage.SelectHints{
Expand All @@ -2447,7 +2448,7 @@ func TestBlocksStoreQuerier_SelectSortedShouldHonorQueryStoreAfter(t *testing.T)
} else {
require.Len(t, finder.Calls, 1)
assert.Equal(t, testData.expectedMinT, finder.Calls[0].Arguments.Get(2))
assert.InDelta(t, testData.expectedMaxT, finder.Calls[0].Arguments.Get(3), float64(15*time.Second.Milliseconds()))
assert.Equal(t, testData.expectedMaxT, finder.Calls[0].Arguments.Get(3))
}
})
}
Expand Down Expand Up @@ -3073,6 +3074,7 @@ func TestBlocksStoreQuerier_MultiTenantQueryStoreAfter(t *testing.T) {
logger: log.NewNopLogger(),
metrics: newBlocksStoreQueryableMetrics(nil),
limits: &blocksStoreLimitsMock{queryStoreAfter: testData.queryStoreAfter},
nowFn: func() time.Time { return now },
}

sp := &storage.SelectHints{
Expand All @@ -3088,10 +3090,7 @@ func TestBlocksStoreQuerier_MultiTenantQueryStoreAfter(t *testing.T) {
} else {
require.Len(t, finder.Calls, 1, testData.description)
assert.Equal(t, testData.expectedMinT, finder.Calls[0].Arguments.Get(2), testData.description)
// Allow 15 seconds of time drift to account for CI environment delays.
// The actual code calls time.Now() when manipulating query time ranges,
// which can differ from the test's captured 'now' value.
assert.InDelta(t, testData.expectedMaxT, finder.Calls[0].Arguments.Get(3), float64(15*time.Second.Milliseconds()), testData.description)
assert.Equal(t, testData.expectedMaxT, finder.Calls[0].Arguments.Get(3), testData.description)
}
})
}
Expand Down Expand Up @@ -3170,6 +3169,7 @@ func TestBlocksStoreQuerier_QueryStoreAfterBoundary(t *testing.T) {
logger: log.NewNopLogger(),
metrics: newBlocksStoreQueryableMetrics(nil),
limits: &blocksStoreLimitsMock{queryStoreAfter: cutoff},
nowFn: func() time.Time { return now },
}

sp := &storage.SelectHints{
Expand All @@ -3185,10 +3185,7 @@ func TestBlocksStoreQuerier_QueryStoreAfterBoundary(t *testing.T) {
} else {
require.Len(t, finder.Calls, 1, testData.description)
assert.Equal(t, testData.expectedMinT, finder.Calls[0].Arguments.Get(2), testData.description)
// Allow 15 seconds of time drift to account for CI environment delays.
// The actual code calls time.Now() when manipulating query time ranges,
// which can differ from the test's captured 'now' value.
assert.InDelta(t, testData.expectedMaxT, finder.Calls[0].Arguments.Get(3), float64(15*time.Second.Milliseconds()), testData.description)
assert.Equal(t, testData.expectedMaxT, finder.Calls[0].Arguments.Get(3), testData.description)
}
})
}
Expand Down
Loading