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

Fix flaky query-frontend integration tests after #10798 #10818

Merged
merged 2 commits into from
Mar 6, 2025
Merged

Fix flaky query-frontend integration tests after #10798 #10818

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91cc1cf
Fix flaky query-frontend tests after #10798
charleskorn Mar 6, 2025
c4a3be8
Bring in https://github.com/grafana/e2e/pull/20
charleskorn Mar 6, 2025
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
4 changes: 3 additions & 1 deletion integration/query_frontend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,9 @@ func runQueryFrontendTest(t *testing.T, cfg queryFrontendTestConfig) {
start := end.Add(-(30*24*time.Hour + 1*time.Hour)) // 30 days + 1 hour. Makes sure we can go above the max partial query length.
_, err = c.QueryRange("{instance=~\"hello.*\"}", start, end, time.Hour)
require.NoError(t, err)
require.NoError(t, queryFrontend.WaitSumMetrics(e2e.Equals(31), "cortex_frontend_split_queries_total"))

// Depending on what time it is and how that aligns with midnight UTC, the query may be broken into 31 or 32 parts.
require.NoError(t, queryFrontend.WaitSumMetrics(e2e.Between(31, 32), "cortex_frontend_split_queries_total"))
}

// No need to repeat the test on start/end time rounding for each user.
Expand Down
11 changes: 11 additions & 0 deletions vendor/github.com/grafana/e2e/metrics.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading