Added async, await to LocalhostClusterTests.cs and Catalog.cs…

… methods
dotnet · Jul 31, 2024 · 803b54d · 803b54d
1 parent 64bd155
commit 803b54d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Orleans.Runtime/Catalog/Catalog.cs b/src/Orleans.Runtime/Catalog/Catalog.cs
@@ -401,7 +401,7 @@ public SiloStatus LocalSiloStatus
             }
         }
 
-        public Task DeleteActivations(List<GrainAddress> addresses, DeactivationReasonCode reasonCode, string reasonText)
+        public async Task DeleteActivations(List<GrainAddress> addresses, DeactivationReasonCode reasonCode, string reasonText)
         {
             using var timeoutTokenSource = new CancellationTokenSource(this.collectionOptions.Value.DeactivationTimeout);
             var tasks = new List<Task>(addresses.Count);
@@ -414,7 +414,7 @@ public Task DeleteActivations(List<GrainAddress> addresses, DeactivationReasonCo
                 }
             }
 
-            return Task.WhenAll(tasks);
+            await Task.WhenAll(tasks);
         }
 
         // TODO move this logic in the LocalGrainDirectory

diff --git a/test/Tester/LocalhostSiloTests.cs b/test/Tester/LocalhostSiloTests.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Orleans.Internal;
-using Orleans.Runtime;
 using Orleans.TestingHost;
 using UnitTests.GrainInterfaces;
 using Xunit;
@@ -90,9 +89,9 @@ public async Task LocalhostClusterTest()
             {
                 using var cancelled = new CancellationTokenSource();
                 cancelled.Cancel();
-                Utils.SafeExecute(() => silo1.StopAsync(cancelled.Token));
-                Utils.SafeExecute(() => silo2.StopAsync(cancelled.Token));
-                Utils.SafeExecute(() => clientHost.StopAsync(cancelled.Token));
+                await Utils.SafeExecuteAsync(silo1.StopAsync(cancelled.Token));
+                await Utils.SafeExecuteAsync(silo2.StopAsync(cancelled.Token));
+                await Utils.SafeExecuteAsync(clientHost.StopAsync(cancelled.Token));
                 Utils.SafeExecute(() => silo1.Dispose());
                 Utils.SafeExecute(() => silo2.Dispose());
                 Utils.SafeExecute(() => clientHost.Dispose());