Remove activation from message target list if constructor threw an ex…

…ception (#5960)

src/OrleansRuntime/Catalog/Catalog.cs

@@ -512,8 +512,17 @@ public ActivationData GetOrCreateActivation(
                 CounterStatistic.FindOrCreate(StatisticNames.CATALOG_ACTIVATION_NON_EXISTENT_ACTIVATIONS).Increment();
                 throw new NonExistentActivationException(msg, address, placement is StatelessWorkerPlacement);
             }
-
-            SetupActivationInstance(result, grainType, genericArguments);
+
+            try
+            {
+                SetupActivationInstance(result, grainType, genericArguments);
+            }
+            catch
+            {
+                // Exception was thrown when trying to constuct the grain
+                UnregisterMessageTarget(result);
+                throw;
+            }
             activatedPromise = InitActivation(result, grainType, genericArguments, requestContextData);
             return result;
         }

test/DefaultCluster.Tests/StatelessWorkerTests.cs

@@ -25,6 +25,20 @@ public StatelessWorkerTests(DefaultClusterFixture fixture, ITestOutputHelper out
         }
 
         [Fact, TestCategory("SlowBVT"), TestCategory("Functional"), TestCategory("StatelessWorker")]
+
+
+
+
+        public async Task StatelessWorkerThrowExceptionConstructor()
+        {
+            var grain = this.GrainFactory.GetGrain<IStatelessWorkerExceptionGrain>(0);
+            for (int i = 0; i < 100; i++)
+            {
+                await Assert.ThrowsAsync<OrleansException>(() => grain.Ping());
+            }
+        }
+
+        [Fact, TestCategory("SlowBVT"), TestCategory("Functional"), TestCategory("StatelessWorker")]
         public async Task StatelessWorkerActivationsPerSiloDoNotExceedMaxLocalWorkersCount()
         {
             var gatewaysCount = HostedCluster.ClientConfiguration.Gateways.Count;

test/TestGrainInterfaces/IStatelessWorkerExceptionGrain.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Orleans;
+
+namespace UnitTests.GrainInterfaces
+{
+    public interface IStatelessWorkerExceptionGrain : IGrainWithIntegerKey
+    {
+        Task Ping();
+    }
+}

test/TestGrainInterfaces/TestGrainInterfaces.csproj

@@ -112,6 +112,7 @@
     <Compile Include="ISimpleGenericGrain.cs" />
     <Compile Include="CodegenTestInterfaces.cs" />
     <Compile Include="ISimpleGrainWithAsyncMethods.cs" />
+    <Compile Include="IStatelessWorkerExceptionGrain.cs" />
     <Compile Include="IStatelessWorkerGrain.cs" />
     <Compile Include="ISimpleObserverableGrain.cs" />
     <Compile Include="IObserverGrain.cs" />

test/TestGrains/StatelessWorkerExceptionGrain.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Orleans;
+using Orleans.Concurrency;
+using Orleans.Runtime;
+using UnitTests.GrainInterfaces;
+
+
+namespace UnitTests.Grains
+{
+    [StatelessWorker(MaxLocalWorkers)]
+    public class StatelessWorkerExceptionGrain : Grain, IStatelessWorkerExceptionGrain
+    {
+        public const int MaxLocalWorkers = 1;
+
+        public StatelessWorkerExceptionGrain()
+        {
+            throw new Exception("oops");
+        }
+
+        public Task Ping()
+        {
+            return Task.CompletedTask;
+        }
+    }
+}

test/TestGrains/TestGrains.csproj

@@ -128,6 +128,7 @@
     <Compile Include="SQLAdapter\DeviceGrain.cs" />
     <Compile Include="SQLAdapter\ICustomerState.cs" />
     <Compile Include="SQLAdapter\IDeviceState.cs" />
+    <Compile Include="StatelessWorkerExceptionGrain.cs" />
     <Compile Include="StatelessWorkerGrain.cs" />
     <Compile Include="SimpleObserverableGrain.cs" />
     <Compile Include="ObserverGrain.cs" />