handle possible case where the run task is waiting for activation and…

… the cancellation has begun
dotnet · Oct 30, 2024 · 70f1675 · 70f1675
1 parent 03e25f8
commit 70f1675
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/Orleans.Core/Manifest/ClientClusterManifestProvider.cs b/src/Orleans.Core/Manifest/ClientClusterManifestProvider.cs
@@ -82,15 +82,18 @@ public async Task StopAsync(CancellationToken cancellationToken)
             try
             {
                 _cancellation.Cancel();
+                if (_runTask is { IsCompleted: false } _task)
+                {
+                    await _task.WaitAsync(cancellationToken);
+                }
             }
-            catch (Exception exception)
+            catch (OperationCanceledException)
             {
-                _logger.LogError(exception, "Error cancelling shutdown token.");
+                _logger.LogInformation("Stoping of {Component} was canceled.", nameof(ClientClusterManifestProvider));
             }
-
-            if (_runTask is { IsCompleted: false } task)
+            catch (Exception exception)
             {
-                await task.WaitAsync(cancellationToken);
+                _logger.LogError(exception, "Error stopping {Component}.", nameof(ClientClusterManifestProvider));
             }
         }