Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kv: perform PushTxn(PUSH_TIMESTAMP) without Raft consensus #95911

Merged
merged 3 commits into from
Feb 2, 2023
Merged

kv: perform PushTxn(PUSH_TIMESTAMP) without Raft consensus #95911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68fd647
kv: check txn push marker on commit, not txn record creation
nvanbenschoten Jan 11, 2023
2abca5c
kv: always promote PUSH_TIMESTAMP to PUSH_ABORT on failed staging record
nvanbenschoten Jan 11, 2023
3dbb321
kv: don't rewrite txn record on PushTxn(TIMESTAMP)
nvanbenschoten Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions pkg/kv/kvserver/batcheval/cmd_end_transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,27 @@ func EndTxn(

// Attempt to commit or abort the transaction per the args.Commit parameter.
if args.Commit {
// Bump the transaction's provisional commit timestamp to account for any
// transaction pushes, if necessary. See the state machine diagram in
// Replica.CanCreateTxnRecord for details.
switch {
case !recordAlreadyExisted, existingTxn.Status == roachpb.PENDING:
BumpToMinTxnCommitTS(ctx, cArgs.EvalCtx, reply.Txn)
case existingTxn.Status == roachpb.STAGING:
// Don't check timestamp cache. The transaction could not have been pushed
// while its record was in the STAGING state so checking is unnecessary.
// Furthermore, checking the timestamp cache and increasing the commit
// timestamp at this point would be incorrect, because the transaction may
// have entered the implicit commit state.
default:
panic("unreachable")
}

// Determine whether the transaction's commit is successful or should
// trigger a retry error.
// NOTE: if the transaction is in the implicit commit state and this EndTxn
// request is marking the commit as explicit, this check must succeed. We
// assert this in txnCommitter.makeTxnCommitExplicitAsync.
if retry, reason, extraMsg := IsEndTxnTriggeringRetryError(reply.Txn, args); retry {
return result.Result{}, roachpb.NewTransactionRetryError(reason, extraMsg)
}
Expand Down
Loading