kvcoord: fix flake in TestTransactionUnexpectedlyCommitted
#111090
Merged
Conversation
This file contains 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 change is |
arulajmani
approved these changes
Sep 21, 2023
AlexTalks
changed the title
TestTransactionUnexpectedlyCommitted.TestTransactionUnexpectedlyCommitted
AlexTalks
force-pushed
the
fix_ambiguous_test_deadlock
branch
from
82240b8 to
663bda8
Compare
|
bors r+ |
|
Build failed (retrying...): |
|
Build failed (retrying...): |
|
Build failed (retrying...): |
|
Build failed (retrying...): |
|
Build failed: |
The `TestTransactionUnexpectedlyCommitted/recovery_after_transfer_lease` test, introduced to test cockroachdb#107658, has been flaky (particularly under deadlock builds) due to a race condition between a retry of a write and intent resolution. While both orderings in this test result in a correct `AmbiguousResultError` for the client, when intent resolution wins the race, the retried write will attempt to push away the current lockholder; since it is illegal for a committed transaction to perform a push, this results in a different secondary error attached to the `AmbiguousResultError`. This change ensures a predefined ordering of these operations so that the secondary error is consistent across runs of the test. Fixes: cockroachdb#110187 Release note: None
AlexTalks
force-pushed
the
fix_ambiguous_test_deadlock
branch
from
663bda8 to
fdb6e86
Compare
|
bors r+ |
|
Build succeeded: |
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.
The
TestTransactionUnexpectedlyCommitted/recovery_after_transfer_leasetest, introduced to test #107658, has been flaky (particularly under deadlock builds) due to a race condition between a retry of a write and intent resolution. While both orderings in this test result in a correctAmbiguousResultErrorfor the client, when intent resolution wins the race, the retried write will attempt to push away the current lockholder; since it is illegal for a committed transaction to perform apush, this results in a different secondary error attached to the
AmbiguousResultError. This change ensures a predefined ordering of these operations so that the secondary error is consistent across runs of the test.Fixes: #110187
Release note: None