feat: Dispose channel on client shutdown.

googleapis · May 5, 2023 · d38ab04 · d38ab04
1 parent 5f3808f
commit d38ab04
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/apis/Google.Cloud.PubSub.V1/Google.Cloud.PubSub.V1/PublisherClientBuilder.cs b/apis/Google.Cloud.PubSub.V1/Google.Cloud.PubSub.V1/PublisherClientBuilder.cs
@@ -126,10 +126,25 @@ private async Task<PublisherClient> BuildAsyncImpl(CancellationToken cancellatio
                 ? await builder.BuildAsync(cancellationToken).ConfigureAwait(false)
                 : builder.Build();
             var channel = builder.LastCreatedChannel;
-            shutdowns[i] = channel is null ? () => Task.CompletedTask : channel.ShutdownAsync;
+            shutdowns[i] = () => DisposeChannelAsync(channel);
         }
         Func<Task> shutdown = () => Task.WhenAll(shutdowns.Select(x => x()));
         return new PublisherClientImpl(TopicName, clients, settings, shutdown);
+
+        // TODO: Move this local method to a common place. We have it here and in SubscriberClientBuilder.
+        static Task DisposeChannelAsync(Grpc.Core.ChannelBase channel)
+        {
+            if (channel is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (channel is IDisposable disposable)
+            {
+                disposable.Dispose();
+            }
+
+            return channel.ShutdownAsync();
+        }
     }
 
     /// <inheritdoc />

diff --git a/apis/Google.Cloud.PubSub.V1/Google.Cloud.PubSub.V1/SubscriberClientBuilder.cs b/apis/Google.Cloud.PubSub.V1/Google.Cloud.PubSub.V1/SubscriberClientBuilder.cs
@@ -125,10 +125,25 @@ private async Task<SubscriberClient> BuildAsyncImpl(CancellationToken cancellati
                 ? await builder.BuildAsync(cancellationToken).ConfigureAwait(false)
                 : builder.Build();
             var channel = builder.LastCreatedChannel;
-            shutdowns[i] = channel is null ? () => Task.CompletedTask : channel.ShutdownAsync;
+            shutdowns[i] = () => DisposeChannelAsync(channel);
         }
         Func<Task> shutdown = () => Task.WhenAll(shutdowns.Select(x => x()));
         return new SubscriberClientImpl(SubscriptionName, clients, settings, shutdown);
+
+        // TODO: Move this local method to a common place. We have it here and in PublisherClientBuilder.
+        static Task DisposeChannelAsync(Grpc.Core.ChannelBase channel)
+        {
+            if (channel is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (channel is IDisposable disposable)
+            {
+                disposable.Dispose();
+            }
+
+            return channel.ShutdownAsync();
+        }
     }
 
     /// <inheritdoc />