From 2cbc32ac756fe3019b026acff3ab62bd95cef97e Mon Sep 17 00:00:00 2001 From: Riya Mehta Date: Fri, 17 Oct 2025 11:26:53 -0700 Subject: [PATCH 1/5] 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/5] 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 From e27490d60fc12892ff9c102869026d0f7e29f706 Mon Sep 17 00:00:00 2001 From: Riya Mehta Date: Wed, 5 Nov 2025 08:29:35 -0800 Subject: [PATCH 3/5] remove unused variable. --- .../grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java | 1 - 1 file changed, 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 94f03945a40..d9272db0088 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 @@ -50,7 +50,6 @@ */ @ThreadSafe public final class S2AHandshakerServiceChannel { - private static final Duration CHANNEL_SHUTDOWN_TIMEOUT = Duration.ofSeconds(10); private static final Logger logger = Logger.getLogger(S2AHandshakerServiceChannel.class.getName()); From fddbd2bd355f649940d473ca02284a60e3b0794e Mon Sep 17 00:00:00 2001 From: Riya Mehta Date: Fri, 7 Nov 2025 10:34:01 -0800 Subject: [PATCH 4/5] remove another unused variable. --- .../grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java | 2 -- 1 file changed, 2 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 d9272db0088..aaa7c2f0098 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 @@ -50,8 +50,6 @@ */ @ThreadSafe public final class S2AHandshakerServiceChannel { - private static final Logger logger = - Logger.getLogger(S2AHandshakerServiceChannel.class.getName()); /** * Returns a {@link SharedResourceHolder.Resource} instance for managing channels to an S2A server From b761010c53387b28b7ea49e4731fcc06436538b9 Mon Sep 17 00:00:00 2001 From: Riya Mehta Date: Fri, 7 Nov 2025 10:50:04 -0800 Subject: [PATCH 5/5] remove unused imports. --- .../grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java | 3 --- 1 file changed, 3 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 aaa7c2f0098..8453268efc0 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 @@ -24,9 +24,6 @@ import io.grpc.ManagedChannel; import io.grpc.internal.SharedResourceHolder.Resource; import io.grpc.netty.NettyChannelBuilder; -import java.time.Duration; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.annotation.concurrent.ThreadSafe; /**