kvserver: deflake TestPromoteNonVoterInAddVoter#155861
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Oct 22, 2025
Merged
kvserver: deflake TestPromoteNonVoterInAddVoter#155861craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
Member
wenyihu6
approved these changes
Oct 22, 2025
This test could previously fail because a lease transfer could race with a split. Without the split, the effects of the span config (that the test asserts on) will not apply. We sidestep this problem by removing the need of a split entirely -- by tuning some cluster settings to ensure that every table is on its own range to begin with. H/t to @pav-kv for the analysis on this one. Closes cockroachdb#155828 Closes cockroachdb#155747 Closes cockroachdb#155316 Closes cockroachdb#154773 Closes cockroachdb#134383 Release note: None
29fe1e5 to
a884f8f
Compare
Collaborator
Author
|
TFTR! bors r+ |
Member
|
Great to have this one sorted out!
…On Wed, Oct 22, 2025, 21:27 Arul Ajmani ***@***.***> wrote:
*arulajmani* left a comment (cockroachdb/cockroach#155861)
<#155861 (comment)>
TFTR!
bors r+
—
Reply to this email directly, view it on GitHub
<#155861 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABGXPZC32SUVIUW6B77F7ND3Y7EAZAVCNFSM6AAAAACJ5RWMUCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTIMZTGY3TMMBQGQ>
.
You are receiving this because your review was requested.Message ID:
***@***.***>
|
craig bot
pushed a commit
that referenced
this pull request
Oct 22, 2025
155616: rangefeed: add assertion that OnError is called on disconnected registration r=stevendanna a=stevendanna Epic: none Release note: None 155797: *: replace some usages of global rand r=yuzefovich a=yuzefovich **sem/builtins: use RNG from eval context for 'st_generatepoints'** ***: replace some usages of global rand** When we use `rand.*` methods like `math/rand.Intn`, under the hood we hit the global rand source, which is protected by a mutex, so we could be subject to contention on that lock. This commit updates some of such usages in favor of object-specific rand source to avoid that. Note that allocating a separate rand source is not free (the allocation itself is about 5KiB in size), so we modify spots where the lifecycle matches that of the server or when the affected code is heavy already / not on the hot path (also when it's clear that the access is from within a single goroutine). Epic: None Release note: None 155861: kvserver: deflake TestPromoteNonVoterInAddVoter r=arulajmani a=arulajmani This test could previously fail because a lease transfer could race with a split. Without the split, the effects of the span config (that the test asserts on) will not apply. We sidestep this problem by removing the need of a split entirely -- by tuning some cluster settings to ensure that every table is on its own range to begin with. H/t to `@pav-kv` for the analysis on this one. Closes #155828 Closes #155747 Closes #155316 Closes #154773 Closes #134383 Release note: None Co-authored-by: Steven Danna <danna@cockroachlabs.com> Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com> Co-authored-by: Arul Ajmani <arulajmani@gmail.com>
Contributor
|
Build failed (retrying...): |
Contributor
This was referenced Oct 22, 2025
|
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating PR, but backport branch blathers/backport-release-24.3-155861 is ready: POST https://api.github.com/repos/cockroachdb/cockroach/pulls: 502 Server Error [] Backport to branch release-24.3 failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Collaborator
|
LGTM. Should we still be concerned about the underlying non-test-only behaviour - the fact that zone config application can be stuck? |
tbg
added a commit
to tbg/cockroach
that referenced
this pull request
Oct 30, 2025
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
added a commit
to tbg/cockroach
that referenced
this pull request
Oct 30, 2025
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
added a commit
to tbg/cockroach
that referenced
this pull request
Oct 31, 2025
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
added a commit
to tbg/cockroach
that referenced
this pull request
Oct 31, 2025
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
added a commit
to tbg/cockroach
that referenced
this pull request
Oct 31, 2025
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
added a commit
to tbg/cockroach
that referenced
this pull request
Oct 31, 2025
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.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This test could previously fail because a lease transfer could race with a split. Without the split, the effects of the span config (that the test asserts on) will not apply. We sidestep this problem by removing the need of a split entirely -- by tuning some cluster settings to ensure that every table is on its own range to begin with.
H/t to @pav-kv for the analysis on this one.
Closes #155828
Closes #155747
Closes #155316
Closes #154773
Closes #134383
Release note: None