From 2cbc32ac756fe3019b026acff3ab62bd95cef97e Mon Sep 17 00:00:00 2001 From: Riya Mehta Date: Fri, 17 Oct 2025 11:26:53 -0700 Subject: [PATCH 1/2] Remove channel.awaitTermination() from S2A ChannelResource. --- .../internal/channel/S2AHandshakerServiceChannel.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/s2a/src/main/java/io/grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java b/s2a/src/main/java/io/grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java index b1ba88d1886..48175581f8f 100644 --- a/s2a/src/main/java/io/grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java +++ b/s2a/src/main/java/io/grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java @@ -100,14 +100,7 @@ public Channel create() { public void close(Channel instanceChannel) { checkNotNull(instanceChannel); ManagedChannel channel = (ManagedChannel) instanceChannel; - channel.shutdownNow(); - try { - channel.awaitTermination(CHANNEL_SHUTDOWN_TIMEOUT.getSeconds(), SECONDS); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - logger.log(Level.WARNING, "Channel to S2A was not shutdown."); - } - + channel.shutdown(); } @Override From b485d20c0e27af0879a3694ff4f9e46c9af479cf Mon Sep 17 00:00:00 2001 From: Riya Mehta Date: Thu, 23 Oct 2025 09:21:30 -0700 Subject: [PATCH 2/2] use shutdownNow --- .../grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2a/src/main/java/io/grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java b/s2a/src/main/java/io/grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java index 48175581f8f..94f03945a40 100644 --- a/s2a/src/main/java/io/grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java +++ b/s2a/src/main/java/io/grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java @@ -100,7 +100,7 @@ public Channel create() { public void close(Channel instanceChannel) { checkNotNull(instanceChannel); ManagedChannel channel = (ManagedChannel) instanceChannel; - channel.shutdown(); + channel.shutdownNow(); } @Override