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.

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

kvserver: fix test merge queue when grunning unsupported #107745

Merged
merged 1 commit into from
Jul 28, 2023

Conversation

kvoli
Copy link
Collaborator

@kvoli kvoli commented Jul 27, 2023

TestMergeQueue/load-based-merging/switch...below-threshold asserts that switching the split objective between CPU and QPS will not cause ranges to merge, even if their pre-switch load qualified them for merging.

This test was broken when grunning was unsupported, as the objective never actually switches to anything other than QPS.

Add a check for grunning support, and assert that a merge occurs if unsupported.

Fixes: #106937
Epic: none
Release note: None

`TestMergeQueue/load-based-merging/switch...below-threshold` asserts
that switching the split objective between CPU and QPS will not cause
range's to merge, even if their pre-switch load qualified them for
merging.

This test was broken when `grunning` was unsupported, as the objective
never actually switches to anything other than QPS.

Add a check for `grunning` support, and assert that a merge occurs if
unsupported.

Fixes: cockroachdb#106937
Epic: none
Release note: None
@kvoli kvoli added the backport-23.1.x Flags PRs that need to be backported to 23.1 label Jul 27, 2023
@kvoli kvoli self-assigned this Jul 27, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@kvoli kvoli marked this pull request as ready for review July 28, 2023 13:40
@kvoli kvoli requested a review from a team as a code owner July 28, 2023 13:40
@kvoli kvoli requested a review from irfansharif July 28, 2023 13:40
@kvoli
Copy link
Collaborator Author

kvoli commented Jul 28, 2023

TYFTR!

bors r=irfansharif

@craig
Copy link
Contributor

craig bot commented Jul 28, 2023

This PR was included in a batch that was canceled, it will be automatically retried

@craig craig bot merged commit 04c91a5 into cockroachdb:master Jul 28, 2023
2 checks passed
@craig
Copy link
Contributor

craig bot commented Jul 28, 2023

Build succeeded:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tests using grunning failed
3 participants