Skip to content

release-26.1: kvcoord: deflake TestTxnCoordSenderRetriesAcrossEndTxn#170929

Merged
trunk-io[bot] merged 1 commit into
release-26.1from
blathers/backport-release-26.1-170836
May 26, 2026
Merged

release-26.1: kvcoord: deflake TestTxnCoordSenderRetriesAcrossEndTxn#170929
trunk-io[bot] merged 1 commit into
release-26.1from
blathers/backport-release-26.1-170836

Conversation

@blathers-crl
Copy link
Copy Markdown

@blathers-crl blathers-crl Bot commented May 26, 2026

Backport 1/1 commits from #170836 on behalf of @pav-kv.


The first subtest asserted ExpectPusheeTxnRecordNotFound, which requires the push to find no txn record at all. However, the heartbeat loop can race and write a PENDING txn record during CommitInBatch execution, causing the push to find that record and fail the assertion.

Replace with the new ExpectNoTxnRecovery expectation, which verifies the actual invariant: no STAGING record was found and no transaction recovery was performed. This tolerates a PENDING record from the heartbeat loop while still checking that the txn was not implicitly committed.

Fixes-25.4 #170829
Epic: none


Release justification: test deflake

The first subtest asserted ExpectPusheeTxnRecordNotFound, which requires
the push to find no txn record at all. However, the heartbeat loop can
race and write a PENDING txn record during CommitInBatch execution,
causing the push to find that record and fail the assertion.

Replace with the new ExpectNoTxnRecovery expectation, which verifies the
actual invariant: no STAGING record was found and no transaction recovery
was performed. This tolerates a PENDING record from the heartbeat loop
while still checking that the txn was not implicitly committed.

Fixes: #170829
Release note: None

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@blathers-crl blathers-crl Bot force-pushed the blathers/backport-release-26.1-170836 branch from b97373e to 5fb9f4e Compare May 26, 2026 14:47
@blathers-crl blathers-crl Bot requested a review from a team as a code owner May 26, 2026 14:47
@blathers-crl blathers-crl Bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels May 26, 2026
@blathers-crl
Copy link
Copy Markdown
Author

blathers-crl Bot commented May 26, 2026

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.

@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io Bot commented May 26, 2026

😎 Merged successfully - details.

@blathers-crl blathers-crl Bot added backport Label PR's that are backports to older release branches T-kv KV Team labels May 26, 2026
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@trunk-io trunk-io Bot merged commit c4ede7b into release-26.1 May 26, 2026
21 checks passed
@trunk-io trunk-io Bot deleted the blathers/backport-release-26.1-170836 branch May 26, 2026 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. T-kv KV Team target-release-26.1.6

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants