fixed #8722

dotnet · Nov 30, 2023 · 7fe9e6f · 7fe9e6f
1 parent aafe70c
commit 7fe9e6f
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Orleans.Core/Manifest/ClientClusterManifestProvider.cs b/src/Orleans.Core/Manifest/ClientClusterManifestProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading;
@@ -28,6 +29,7 @@ internal class ClientClusterManifestProvider : IClusterManifestProvider, IAsyncD
         private readonly CancellationTokenSource _cancellation = new CancellationTokenSource();
         private ClusterManifest _current;
         private Task _runTask;
+        private ConcurrentDictionary<SiloAddress, MajorMinorVersion> siloAddressVersionMap = new ConcurrentDictionary<SiloAddress, MajorMinorVersion>();
 
         public ClientClusterManifestProvider(
             IServiceProvider services,
@@ -79,7 +81,12 @@ private async Task RunAsync()
                     try
                     {
                         var provider = grainFactory.GetGrain<IClusterManifestSystemTarget>(SystemTargetGrainId.Create(Constants.ManifestProviderType, gateway).GrainId);
-                        var refreshTask = provider.GetClusterManifestIfNewer(_current.Version).AsTask();
+                        var currentVersion = _current.Version;
+                        if (siloAddressVersionMap.ContainsKey(gateway))
+                        {
+                            siloAddressVersionMap.TryGetValue(gateway, out currentVersion);
+                        }
+                        var refreshTask = provider.GetClusterManifestIfNewer(currentVersion).AsTask();
                         var task = await Task.WhenAny(cancellationTask, refreshTask).ConfigureAwait(false);
 
                         if (ReferenceEquals(task, cancellationTask))
@@ -94,6 +101,7 @@ private async Task RunAsync()
                             await Task.WhenAny(cancellationTask, Task.Delay(_typeManagementOptions.TypeMapRefreshInterval));
                             continue;
                         }
+                        siloAddressVersionMap[gateway] = updatedManifest.Version;
 
                         if (!_updates.TryPublish(updatedManifest))
                         {