Browse Source

Fix "Collection was modified" in LocalEventBus when handlers subscribe during a publish

Loop over a copy of each handler list taken under its lock, as EventBusBase.TriggerHandlersAsync does since #21786.

Resolves #26342
pull/26343/head
Tiago Rodrigues 3 weeks ago
parent
commit
ce46ced0f5
  1. 6
      framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs
  2. 83
      framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Local/EventBus_Concurrency_Test.cs

6
framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs

@ -217,7 +217,7 @@ public class LocalEventBus : EventBusBase, ILocalEventBus, ISingletonDependency
foreach (var handlerFactory in HandlerFactories.Where(hf => ShouldTriggerEventForHandler(eventType, hf.Key)))
{
foreach (var factory in handlerFactory.Value)
foreach (var factory in handlerFactory.Value.Locking(factories => factories.ToArray()))
{
handlerFactoryList.Add(new Tuple<IEventHandlerFactory, Type, int>(
factory,
@ -228,7 +228,7 @@ public class LocalEventBus : EventBusBase, ILocalEventBus, ISingletonDependency
foreach (var handlerFactory in DynamicEventHandlerFactories.Where(aehf => eventNames.Contains(aehf.Key)))
{
foreach (var factory in handlerFactory.Value)
foreach (var factory in handlerFactory.Value.Locking(factories => factories.ToArray()))
{
handlerFactoryList.Add(new Tuple<IEventHandlerFactory, Type, int>(
factory,
@ -252,7 +252,7 @@ public class LocalEventBus : EventBusBase, ILocalEventBus, ISingletonDependency
foreach (var handlerFactory in DynamicEventHandlerFactories.Where(aehf => aehf.Key == eventName))
{
foreach (var factory in handlerFactory.Value)
foreach (var factory in handlerFactory.Value.Locking(factories => factories.ToArray()))
{
using var handler = factory.GetHandler();
var handlerType = handler.EventHandler.GetType();

83
framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Local/EventBus_Concurrency_Test.cs

@ -0,0 +1,83 @@
using System.Threading;
using System.Threading.Tasks;
using Xunit;
namespace Volo.Abp.EventBus.Local;
public class EventBus_Concurrency_Test : EventBusTestBase
{
private const int PublishCount = 10_000;
[Fact]
public async Task Should_Publish_While_Other_Handlers_Subscribe_And_Unsubscribe()
{
var handledCount = 0;
using var subscription = LocalEventBus.Subscribe<MySimpleEventData>(_ =>
{
Interlocked.Increment(ref handledCount);
return Task.CompletedTask;
});
using var cts = new CancellationTokenSource();
var churn = Task.Run(() =>
{
while (!cts.IsCancellationRequested)
{
LocalEventBus.Subscribe<MySimpleEventData>(_ => Task.CompletedTask).Dispose();
}
});
try
{
for (var i = 0; i < PublishCount; i++)
{
await LocalEventBus.PublishAsync(new MySimpleEventData(1), onUnitOfWorkComplete: false);
}
}
finally
{
cts.Cancel();
await churn;
}
Assert.Equal(PublishCount, handledCount);
}
[Fact]
public async Task Should_Publish_Dynamic_Event_While_Other_Handlers_Subscribe_And_Unsubscribe()
{
const string eventName = "MyConcurrencyTestDynamicEvent";
var handledCount = 0;
using var subscription = LocalEventBus.Subscribe(eventName, new SingleInstanceHandlerFactory(
new ActionEventHandler<DynamicEventData>(_ =>
{
Interlocked.Increment(ref handledCount);
return Task.CompletedTask;
})));
using var cts = new CancellationTokenSource();
var churn = Task.Run(() =>
{
while (!cts.IsCancellationRequested)
{
LocalEventBus.Subscribe(eventName, new SingleInstanceHandlerFactory(
new ActionEventHandler<DynamicEventData>(_ => Task.CompletedTask))).Dispose();
}
});
try
{
for (var i = 0; i < PublishCount; i++)
{
await LocalEventBus.PublishAsync(eventName, new { Value = 1 }, onUnitOfWorkComplete: false);
}
}
finally
{
cts.Cancel();
await churn;
}
Assert.Equal(PublishCount, handledCount);
}
}
Loading…
Cancel
Save