Catch shutdown cancellation exceptions for conformance provider (#4825)

* Catch shutdown cancellation exceptions for conformance provider * reenable disposing semaphores * Simplify disposal code * undo semaphore slim disposal changes
microsoft · Feb 18, 2025 · 718597c · 718597c
1 parent 4fc790f
commit 718597c
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/Microsoft.Health.Fhir.Core/Features/Conformance/SystemConformanceProvider.cs b/src/Microsoft.Health.Fhir.Core/Features/Conformance/SystemConformanceProvider.cs
@@ -280,7 +280,18 @@ public async ValueTask DisposeAsync()
 
             if (_rebuilder != null)
             {
-                await _rebuilder;
+                try
+                {
+                    await _rebuilder;
+                }
+                catch (OperationCanceledException)
+                {
+                    _logger.LogInformation("DisposeAsync detected OperationCanceledException while awaiting background loop. Exiting cleanly.");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Unexpected error while disposing SystemConformanceProvider.");
+                }
             }
 
             _cancellationTokenSource.Dispose();