Skip to content

Guard acceptance testing from calling non-thread-safe AddNServiceBusEndpoint concurrently #7755

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

Closed
DavidBoike wants to merge 1 commit into from
+18 −7
Closed

Guard acceptance testing from calling non-thread-safe AddNServiceBusEndpoint concurrently #7755

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
25 changes: 18 additions & 7 deletions src/NServiceBus.AcceptanceTesting/Support/EndpointBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,23 @@ public EndpointBehavior(IEndpointConfigurationFactory endpointBuilder, int insta

var serviceKey = collectionAdapter.ServiceKey;

collectionAdapter.Inner.AddNServiceBusEndpoint(config, serviceKey);
// we don't want to expose the lifecycle in Core, but some super advanced scenarios require
// stopping the endpoint and this backdoor allows that without having to expose the lifecycle in Core
collectionAdapter.AddKeyedSingleton<Func<CancellationToken, Task>>("Stopper", (provider, key) =>
// Prevent concurrent access to AddNServiceBusEndpoint, which enumerates and modifies the service collection
configureSemaphore.Wait();
try
{
var endpointLifecycle = provider.GetRequiredKeyedService<IEndpointLifecycle>(serviceKey);
return async token => await endpointLifecycle.Stop(token).ConfigureAwait(false);
});
collectionAdapter.Inner.AddNServiceBusEndpoint(config, serviceKey);
// we don't want to expose the lifecycle in Core, but some super advanced scenarios require
// stopping the endpoint and this backdoor allows that without having to expose the lifecycle in Core
collectionAdapter.AddKeyedSingleton<Func<CancellationToken, Task>>("Stopper", (provider, key) =>
{
var endpointLifecycle = provider.GetRequiredKeyedService<IEndpointLifecycle>(serviceKey);
return async token => await endpointLifecycle.Stop(token).ConfigureAwait(false);
});
}
finally
{
configureSemaphore.Release();
}

return Task.FromResult(new StartableEndpointInstance(serviceKey));
}, static (startableEndpoint, provider, cancellationToken) => startableEndpoint.Start(provider, cancellationToken));
Expand Down Expand Up @@ -107,4 +116,6 @@ public async Task<ComponentRunner> CreateRunner(RunDescriptor run)

Func<IServiceCollection, EndpointConfiguration, Task<object>> createInstanceCallback;
Func<object, IServiceProvider, CancellationToken, Task<Func<CancellationToken, Task>>> startInstanceCallback;

static readonly SemaphoreSlim configureSemaphore = new SemaphoreSlim(1, 1);
}
Loading