kvcoord: deflake TestTxnCoordSenderRetriesAcrossEndTxn#170836
Open
pav-kv wants to merge 3 commits into
Open
Conversation
…iesAcrossEndTxn Add a sleep during the first CPut attempt to give the heartbeat loop time to write a txn record before CommitInBatch completes. This reliably reproduces the race where CheckPushResult finds an existing txn record instead of getting "pushee txn record not found". Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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: cockroachdb#170829 Release note: None Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
pav-kv
added
the
backport-all
Contributor
|
Merging to
After your PR is submitted to the merge queue, this comment will be automatically updated with its status. If the PR fails, failure details will also be posted here |
Member
|
This change is |
Collaborator
Author
|
@arulajmani I'll squash the first and last commit out when merging, this is just a repro. |
pav-kv
commented
May 22, 2026
| // transaction recovery. This is weaker than ExpectPusheeTxnRecordNotFound: it | ||
| // tolerates a PENDING txn record (e.g. written by the heartbeat loop) but | ||
| // verifies no STAGING record was found and recovered. | ||
| ExpectNoTxnRecovery |
Collaborator
Author
There was a problem hiding this comment.
@arulajmani @stevendanna Please verify the wording here and all places. I don't have much intuition here.
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.
The first subtest asserted
ExpectPusheeTxnRecordNotFound, which requires the push to find no txn record at all. However, the heartbeat loop can race and write aPENDINGtxn record duringCommitInBatchexecution, causing the push to find that record and fail the assertion.Replace with the new
ExpectNoTxnRecoveryexpectation, which verifies the actual invariant: noSTAGINGrecord was found and no transaction recovery was performed. This tolerates aPENDINGrecord from the heartbeat loop while still checking that the txn was not implicitly committed.Fixes-25.4 #170829
Epic: none