Skip to content

Skip BeginTransactionAsync when transaction already exists on DbContext #2159

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
jeremydmiller merged 1 commit into from
Feb 10, 2026
Merged

Skip BeginTransactionAsync when transaction already exists on DbContext #2159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/Persistence/MartenTests/Bugs/Bug_262_test_does_not_complete_with_timeout_message.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using IntegrationTests;
using JasperFx.Core;
using Marten;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
Expand Down Expand Up @@ -39,7 +40,10 @@ public async Task should_work_but_doesnt()

var id = Guid.NewGuid();

await host.InvokeMessageAndWaitAsync(new SomeCommand(id));
await host.TrackActivity()
.Timeout(30.Seconds())
.WaitForMessageToBeReceivedAt<SomeTimeout>(host)
.InvokeMessageAndWaitAsync(new SomeCommand(id));

using var session = host.Services.GetRequiredService<IDocumentStore>().LightweightSession();

Expand Down
12 changes: 5 additions & 7 deletions src/Persistence/Wolverine.EntityFrameworkCore/Codegen/EnrollDbContextInTransaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using JasperFx.CodeGeneration.Frames;
using JasperFx.CodeGeneration.Model;
using JasperFx.Core.Reflection;
using Microsoft.EntityFrameworkCore.Storage;
using Wolverine.EntityFrameworkCore.Internals;
using Wolverine.Persistence;
using Wolverine.Runtime;
Expand All @@ -24,12 +23,9 @@ public EnrollDbContextInTransaction(Type dbContextType, IdempotencyStyle idempot
_dbContextType = dbContextType;
_idempotencyStyle = idempotencyStyle;

Transaction = new Variable(typeof(IDbContextTransaction), $"tx_{_dbContextType.NameInCode().Sanitize()}", this);
_envelopeTransaction = new Variable(typeof(EfCoreEnvelopeTransaction), this);
}

public Variable Transaction { get; }

public override void GenerateCode(GeneratedMethod method, ISourceWriter writer)
{
writer.WriteLine("");
Expand All @@ -39,9 +35,11 @@ public override void GenerateCode(GeneratedMethod method, ISourceWriter writer)
writer.Write(
$"await {_context.Usage}.{nameof(MessageContext.EnlistInOutboxAsync)}({_envelopeTransaction.Usage}).ConfigureAwait(false);");


writer.WriteComment("Start the actual database transaction");
writer.Write($"using var {Transaction.Usage} = await {_dbContext.Usage}.Database.BeginTransactionAsync({_cancellation.Usage}).ConfigureAwait(false);");

writer.WriteComment("Start the actual database transaction if one does not already exist");
writer.Write($"BLOCK:if ({_dbContext.Usage}.Database.CurrentTransaction == null)");
writer.Write($"await {_dbContext.Usage}.Database.BeginTransactionAsync({_cancellation.Usage}).ConfigureAwait(false);");
writer.FinishBlock();
writer.Write("BLOCK:try");

// EF Core can only do eager idempotent checks
Expand Down
Loading