Correctly dispose enumerator, remove unused GetGrainAsync

dotnet · Dec 14, 2023 · c9ceba9 · c9ceba9
1 parent 8104fc4
commit c9ceba9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 46 deletions.
diff --git a/src/Orleans.Core/Core/GrainFactory.cs b/src/Orleans.Core/Core/GrainFactory.cs
@@ -229,51 +229,6 @@ private IAddressable GetGrain(Type interfaceType, IdSpan grainKey, string grainC
             return grain;
         }
 
-        internal async ValueTask<IAddressable> GetGrainAsync(GrainInterfaceType grainInterfaceType, IdSpan grainKey, string grainClassNamePrefix, CancellationToken cancellationToken)
-        {
-            GrainType grainType;
-            Exception lastException = null;
-            do
-            {
-                try
-                {
-                    if (!string.IsNullOrWhiteSpace(grainClassNamePrefix))
-                    {
-                        grainType = this.interfaceTypeToGrainTypeResolver.GetGrainType(grainInterfaceType, grainClassNamePrefix);
-                    }
-                    else
-                    {
-                        grainType = this.interfaceTypeToGrainTypeResolver.GetGrainType(grainInterfaceType);
-                    }
-                }
-                catch (ArgumentException ex)
-                {
-                    // Not found in the type map. Maybe it's not available yet ? (heterogeneous case)
-                    grainType = GrainTypePrefix.CreateStubGrainType(grainClassNamePrefix);
-                    lastException = ex;
-                }
-                try
-                {
-                    await Task.Delay(1_000, cancellationToken);
-                }
-                catch (TaskCanceledException)
-                {
-                    break;
-                }
-            }
-            while (grainType.IsStubGrain() || cancellationToken.IsCancellationRequested);
-
-            if (grainType.IsStubGrain())
-            {
-                Debug.Assert(lastException != null);
-                throw lastException;
-            }
-
-            var grainId = GrainId.Create(grainType, grainKey);
-            var grain = this.referenceActivator.CreateReference(grainId, grainInterfaceType);
-            return grain;
-        }
-
         /// <summary>
         /// Creates a grain reference.
         /// </summary>

diff --git a/src/Orleans.Core/GrainReferences/GrainReferenceActivator.cs b/src/Orleans.Core/GrainReferences/GrainReferenceActivator.cs
@@ -220,7 +220,7 @@ private async Task ResolveGrainTypeAsync(GrainReference reference, IInvokable re
                 _ = GrainTypePrefix.TryGetCrainClassPrefix(reference.GrainId.Type, out var grainClassPrefix);
                 var timeout = request.GetDefaultResponseTimeout() ?? _runtimeClient.GetResponseTimeout();
                 using var cancellation = new CancellationTokenSource(timeout, _timeProvider);
-                var clusterManifestUpdates = _clusterManifestProvider.Updates.WithCancellation(cancellation.Token).GetAsyncEnumerator();
+                await using var clusterManifestUpdates = _clusterManifestProvider.Updates.WithCancellation(cancellation.Token).GetAsyncEnumerator();
                 GrainType grainType;
                 while (!_interfaceTypeToGrainTypeResolver.TryGetGrainType(reference.InterfaceType, grainClassPrefix, out grainType))
                 {