Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
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
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.
Resolved
TransactionDiagnosticEvents.EmitTransactionCancelCompleted(
resource,
transactionId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,30 @@ public void FreshRemoteCommitRetainsFirstPingGraceThenUsesBoundedExponentialRetr
}
}

[Fact]
public async Task CancelBeforePrepareCausesLatePrepareToRetainTransactionId()
{
Comment thread
ReubenBond marked this conversation as resolved.
Resolved
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