Avoid constant try/catch on a non-existing gateway for external clust…

…er client (#8792) * Avoid constant try/catch on a non-existing gateway for external cluster client connection * Put a delay so that calling GetLiveGateway doesn't happen so frequently --------- Co-authored-by: Ledjon Behluli <Ledjon@notiphy.io>
dotnet · Jan 9, 2024 · 876d4ec · 876d4ec
1 parent cab108e
commit 876d4ec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/Orleans.Core/Manifest/ClientClusterManifestProvider.cs b/src/Orleans.Core/Manifest/ClientClusterManifestProvider.cs
@@ -94,6 +94,12 @@ private async Task RunAsync()
                     if (gateway is null || !_gatewayManager.IsGatewayAvailable(gateway))
                     {
                         gateway = _gatewayManager.GetLiveGateway();
+                        if (gateway is null)
+                        {
+                            await Task.Delay(StandardExtensions.Min(_typeManagementOptions.TypeMapRefreshInterval, TimeSpan.FromMilliseconds(500)));
+                            continue;
+                        }
+
                         provider = grainFactory.GetGrain<IClusterManifestSystemTarget>(SystemTargetGrainId.Create(Constants.ManifestProviderType, gateway).GrainId);
 
                         // Accept any cluster manifest version from the new gateway.

diff --git a/src/Orleans.Core/Messaging/GatewayManager.cs b/src/Orleans.Core/Messaging/GatewayManager.cs
@@ -152,7 +152,9 @@ public override string ToString()
         /// is in the same order every time.
         /// </summary>
         /// <returns></returns>
-        public SiloAddress GetLiveGateway()
+        #nullable enable
+        public SiloAddress? GetLiveGateway()
+        #nullable disable
         {
             List<SiloAddress> live = GetLiveGateways();
             int count = live.Count;
@@ -168,6 +170,7 @@ public SiloAddress GetLiveGateway()
             // If we drop through, then all of the known gateways are presumed dead
             return null;
         }
+
 
         public List<SiloAddress> GetLiveGateways()
         {

diff --git a/test/TesterInternal/GatewaySelectionTest.cs b/test/TesterInternal/GatewaySelectionTest.cs
@@ -53,6 +53,7 @@ protected async Task Test_GatewaySelection(IGatewayListProvider listProvider)
             for (int i = 0; i < 2300; i++)
             {
                 var ip = gatewayManager.GetLiveGateway();
+                Assert.NotNull(ip);
                 var addr = ip.Endpoint.Address;
                 Assert.Equal(IPAddress.Loopback, addr);  // "Incorrect IP address returned for gateway"
                 Assert.True((0 < ip.Endpoint.Port) && (ip.Endpoint.Port < 5), "Incorrect IP port returned for gateway");