Skip to content

storage: put an Aborted txn inside a TxnAbortedError#25539

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
andreimatei:txn-aborte
May 16, 2018
Merged

storage: put an Aborted txn inside a TxnAbortedError#25539
craig[bot] merged 1 commit intocockroachdb:masterfrom
andreimatei:txn-aborte

Conversation

@andreimatei
Copy link
Copy Markdown
Contributor

TxnAbortedErrors have an updated transaction it them. It makes sense for
that transaction to be marked as Aborted, instead of Pending.

TxnAbortedErrors have an updated transaction it them. It makes sense for
that transaction to be marked as Aborted, instead of Pending.
@andreimatei andreimatei requested a review from a team May 16, 2018 01:56
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@bdarnell
Copy link
Copy Markdown
Contributor

:lgtm:


Review status: 0 of 2 files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@bdarnell
Copy link
Copy Markdown
Contributor

This change seems like a good idea, but remember that if you're going to take advantage of it in a future change that you'll need to consider mixed-version clusters that will continue to send pending transactions in this case.

@andreimatei
Copy link
Copy Markdown
Contributor Author

ack

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 16, 2018

Build failed (retrying...)

craig bot pushed a commit that referenced this pull request May 16, 2018
25261: storage: harden replica write backpressure mechanism r=nvanbenschoten a=nvanbenschoten

Fixes #24215.
Fixes #25036.
Fixes #24974.
Fixes #25141.
Fixes #25142.

This PR includes a change to harden the replica's write backpressure
mechanism. We now reject backpressured write when a range is unsplittable.
This is important for placing an upper bound on the size of a range when it
consists of just a single row (#24215).

The change also fixes a few flaky tests that resulted from backpressure
not being restrictive enough.

25539: storage: put an Aborted txn inside a TxnAbortedError r=andreimatei a=andreimatei

TxnAbortedErrors have an updated transaction it them. It makes sense for
that transaction to be marked as Aborted, instead of Pending.

Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 16, 2018

Build succeeded

@craig craig bot merged commit 7cb0900 into cockroachdb:master May 16, 2018
@andreimatei andreimatei deleted the txn-aborte branch May 17, 2018 00:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants