release-25.4: kvserver: deflake and improve obs in TestPromoteNonVoterInAddVoter #156619
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This (hopefully) avoids the timeout in TestPromoteNonVoterInAddVoter that could previously result if an ill-timed lease transfer prevented reactively splitting in response to the zone configuration (which would then delay application of the replication factor in said zone config). Fixes cockroachdb#156530.
It tends to change as splits happen.
This reverts commit a884f8f (cockroachdb#155861). As far as I understand, the cluster settings in this commit had the effect of making sure that the span config for the table in the test was exactly `[/Table/N,/Table/(N+1))`, i.e. that it wouldn't merge with adjacent configs. But in a recent flake we see that the real problem is that the range containing our table sometimes extends past the span config (in a recent example, it reached the end of the keyspace and wasn't split down in time for the test to pass). Since commits in this PR ensure that the splitting happens proactively, it should not matter whether span configs are coalesced or not, and we back out that attempt at a fix as it's unclear what positive effect it may have. @arulajmani: I'm probably missing something here. Happy to update the description if so.
tbg
force-pushed
the
blathers/backport-release-25.4-156540
branch
from
72d6bfa to
d52e7e7
Compare
blathers-crl
bot
added
blathers-backport
|
Thanks for opening a backport. Before merging, please confirm that the change does not break backwards compatibility and otherwise complies with the backport policy. Include a brief release justification in the PR description explaining why the backport is appropriate. All backports must be reviewed by the TL for the owning area. While the stricter LTS policy does not yet apply, please exercise judgment and consider gating non-critical changes behind a disabled-by-default feature flag when appropriate. |
blathers-crl
bot
added
backport
Member
|
This change is |
arulajmani
approved these changes
Oct 31, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 7/7 commits from #156540 on behalf of @tbg.
This attempts to finally put #156530 to rest. See individual commits, but broad stokes are that we repeatedly force-process the split queue (and not only the replicate queue), to make sure the range can quickly have the span config applied to it. I also added a bunch of span config and descriptor related debug output that should make it clear where the problem is should this test fail again.
Unfortunately, reproducing failures in this test seems to be difficult, though others seem to have managed.
Closes #156530.
Epic: none
Release justification: test flake fix