release-26.1: server: deflake TestStatusAPIContentionEvents contention event check#170000
Merged
trunk-io[bot] merged 1 commit intoMay 9, 2026
Merged
Conversation
The test queried the contention events HTTP endpoint once and immediately asserted the test table's event was present. But contention events are collected asynchronously — the existing WaitForTransactionEntriesAtLeast call only waits for transaction stats (a different subsystem), so the contention event may not have been ingested yet. Under race builds or slow CI, this manifests as finding system table contention but not the test table's contention. Wrap the contention event HTTP query and table-ID check in testutils.SucceedsSoon, matching the retry pattern already used for statement and transaction stats later in the same test. Fixes: cockroachdb#169050 Epic: none Release note: None Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
|
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. |
Contributor
|
😎 Merged successfully - details. |
blathers-crl
Bot
added
backport
Member
|
This change is |
|
Detected infrastructure failure (matched: self-hosted runner lost communication with the server). Automatically rerunning failed jobs. (run link) |
blathers-crl
Bot
added
backport-failed
backport-test-only
![blathers-crl[bot]](https://avatars.githubusercontent.com/in/59700?s=60&v=4){kind=small}
Contributor
|
/trunk merge |
This was referenced May 13, 2026
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
2 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 1/1 commits from #169156.
/cc @cockroachdb/release
The test queried the contention events HTTP endpoint once and
immediately asserted the test table's event was present. But
contention events are collected asynchronously — the existing
WaitForTransactionEntriesAtLeastcall only waits for transactionstats (a different subsystem), so the contention event may not
have been ingested yet. Under race builds or slow CI, this
manifests as finding system table contention but not the test
table's contention.
Wrap the contention event HTTP query and table-ID check in
testutils.SucceedsSoon, matching the retry pattern already usedfor statement and transaction stats later in the same test.
Fixes: #169050
Epic: none
Release note: None
Release justification: test-only deflake