Fixed deadlock when loading the gateway configuration.

ChilliCream · Jul 3, 2023 · 90746df · 90746df
1 parent a558f1b
commit 90746df
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/HotChocolate/Fusion/src/Core/DependencyInjection/GatewayConfigurationFileObserver.cs b/src/HotChocolate/Fusion/src/Core/DependencyInjection/GatewayConfigurationFileObserver.cs
@@ -32,6 +32,9 @@ public FileConfigurationSession(IObserver<GatewayConfiguration> observer, string
         {
             _observer = observer;
             _fileName = fileName;
+
+            BeginLoadConfig();
+
             var fullPath = Path.GetFullPath(fileName);
             var directory = Path.GetDirectoryName(fullPath);
 
@@ -86,7 +89,6 @@ private void BeginLoadConfig()
                     catch(Exception ex)
                     {
                         _observer.OnError(ex);
-                        _observer.OnCompleted();
                     }
                 });
 

diff --git a/src/HotChocolate/Fusion/src/Core/DependencyInjection/GatewayConfigurationTypeModule.cs b/src/HotChocolate/Fusion/src/Core/DependencyInjection/GatewayConfigurationTypeModule.cs
@@ -4,7 +4,6 @@
 using HotChocolate.Fusion.Configuration;
 using HotChocolate.Fusion.Metadata;
 using HotChocolate.Language;
-using HotChocolate.Utilities;
 using static System.Threading.Tasks.TaskCreationOptions;
 
 namespace Microsoft.Extensions.DependencyInjection;
@@ -31,18 +30,28 @@ public GatewayConfigurationTypeModule(
             config =>
             {
                 _configuration = config.Document;
-                _ready.TrySetResult();
+
+                if (!_ready.Task.IsCompletedSuccessfully)
+                {
+                    _ready.TrySetResult();
+                }
+
                 OnTypesChanged();
             },
-            error => _ready.TrySetException(error),
+            _ => { },
             () => _ready.TrySetCanceled());
     }
 
     internal override async ValueTask ConfigureAsync(
         ConfigurationContext context,
         CancellationToken cancellationToken)
     {
-        await _ready.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
+        if (!_ready.Task.IsCompletedSuccessfully)
+        {
+            await _ready.Task.WaitAsync(cancellationToken)
+                .WaitAsync(TimeSpan.FromSeconds(5), cancellationToken)
+                .ConfigureAwait(false);
+        }
 
         if (_configuration is null)
         {
@@ -60,7 +69,7 @@ internal override async ValueTask ConfigureAsync(
         ApplyConfiguration(context.SchemaBuilder, config);
     }
 
-    private void ApplyConfiguration(ISchemaBuilder schemaBuilder, DocumentNode config)
+    private static void ApplyConfiguration(ISchemaBuilder schemaBuilder, DocumentNode config)
     {
         var rewriter = new FusionGraphConfigurationToSchemaRewriter();
         var fusionGraphConfig = FusionGraphConfiguration.Load(config);