release-2.1: client: remove a bad assertion #29456
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
We were asserting that a txn closure doesn't declare success if the txn is marked as ABORTED. Some sort of error is generally expected in that case. Unfortunately, the assertion is naive. The proto can be marked as ABORTED async by the heartbeat loop, in which case the client only finds out on the imminent commit attempt. Fix cockroachdb#28743 Release note: bug fix: fix a rare crash with the message "no err but aborted txn proto"
|
This change is |
nvanbenschoten
approved these changes
Sep 1, 2018
|
bors r+
…On Sat, Sep 1, 2018 at 2:12 PM Nathan VanBenschoten < ***@***.***> wrote:
***@***.**** approved this pull request.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#29456 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAXBcW_oS9pjB5qnIYc1vtPQbMjEAwAzks5uWs4XgaJpZM4WV9Wc>
.
|
craig bot
pushed a commit
that referenced
this pull request
Sep 2, 2018
29456: release-2.1: client: remove a bad assertion r=andreimatei a=andreimatei Backport 1/1 commits from #29442. /cc @cockroachdb/release --- We were asserting that a txn closure doesn't declare success if the txn is marked as ABORTED. Some sort of error is generally expected in that case. Unfortunately, the assertion is naive. The proto can be marked as ABORTED async by the heartbeat loop, in which case the client only finds out on the imminent commit attempt. Fix #28743 Release note: bug fix: fix a rare crash with the message "no err but aborted txn proto" Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>
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.
Backport 1/1 commits from #29442.
/cc @cockroachdb/release
We were asserting that a txn closure doesn't declare success if the txn
is marked as ABORTED. Some sort of error is generally expected in that
case.
Unfortunately, the assertion is naive. The proto can be marked as
ABORTED async by the heartbeat loop, in which case the client only finds
out on the imminent commit attempt.
Fix #28743
Release note: bug fix: fix a rare crash with the message "no err but
aborted txn proto"