Skip to content

fix(transactions): release locks when cancel precedes prepare #10743

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

Merged
ReubenBond merged 3 commits into from
Aug 21, 2026
Merged

fix(transactions): release locks when cancel precedes prepare #10743

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
38021f9
fix(transactions): release locks for early cancels
ReubenBond Aug 21, 2026
b72251c
fix(transactions): preserve ids for broken locks
ReubenBond Aug 21, 2026
5c87e4a
test(transactions): clarify cancel-before-prepare case
ReubenBond Aug 21, 2026
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
2 changes: 1 addition & 1 deletion src/Orleans.Transactions/State/ReaderWriterLock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void completion()
{
if (currentGroup == null || !currentGroup.TryGetValue(transactionId, out TransactionRecord<TState>? record))
{
return (TransactionalStatus.BrokenLock, new TransactionRecord<TState>());
return (TransactionalStatus.BrokenLock, new TransactionRecord<TState> { TransactionId = transactionId });
}
else if (record.NumberReads != accessCount.Reads
|| record.NumberWrites != accessCount.Writes)
Expand Down
4 changes: 4 additions & 0 deletions src/Orleans.Transactions/State/TransactionQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,10 @@ public async Task NotifyOfCancel(Guid transactionId, DateTime timeStamp, Transac

if (pos == -1)
{
// Cancel can overtake the one-way prepare message. Release the pre-prepare lock so a
// late prepare observes a broken lock and completes without persisting a remote commit.
this.RWLock.Rollback(transactionId);
this.RWLock.Notify();
Comment thread
ReubenBond marked this conversation as resolved.
TransactionDiagnosticEvents.EmitTransactionCancelCompleted(
resource,
transactionId,
Expand Down
24 changes: 24 additions & 0 deletions test/Transactions/Orleans.Transactions.Tests/TransactionRecoveryLatencyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,30 @@ public void FreshRemoteCommitRetainsFirstPingGraceThenUsesBoundedExponentialRetr
}
}

[Fact]
public async Task CancelBeforePrepareBreaksPrePrepareLockAndRetainsTransactionId()
{
var resource = CreateParticipant("resource", ParticipantId.Role.Resource);
var queue = new GatedCancelTransactionQueue(resource, new TestActivationLifetime());
var transactionId = Guid.NewGuid();
var timeStamp = new DateTime(2026, 8, 8, 12, 0, 0, DateTimeKind.Utc);
var accessCount = new AccessCounter { Writes = 1 };

await queue.RWLock.EnterLock(
transactionId,
timeStamp,
default,
isRead: false,
exclusiveLock: false,
static () => 0);

await queue.NotifyOfCancel(transactionId, timeStamp, TransactionalStatus.CascadingAbort);

var (status, record) = await queue.RWLock.ValidateLock(transactionId, accessCount);
Assert.Equal(TransactionalStatus.BrokenLock, status);
Assert.Equal(transactionId, record.TransactionId);
}

[Fact]
public void StorageBatchTracksCommittedTransactionIds()
{
Expand Down
Loading