Skip to content

s2a: Remove channel.awaitTermination() from S2A ChannelResource. #12424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

s2a: Remove channel.awaitTermination() from S2A ChannelResource. #12424

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2cbc32a
Remove channel.awaitTermination() from S2A ChannelResource.
rmehta19 Oct 17, 2025
b485d20
use shutdownNow
rmehta19 Oct 23, 2025
e27490d
remove unused variable.
rmehta19 Nov 5, 2025
fddbd2b
remove another unused variable.
rmehta19 Nov 7, 2025
b761010
remove unused imports.
rmehta19 Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions s2a/src/main/java/io/grpc/s2a/internal/channel/S2AHandshakerServiceChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -50,9 +47,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());

/**
* Returns a {@link SharedResourceHolder.Resource} instance for managing channels to an S2A server
Expand Down Expand Up @@ -101,13 +95,6 @@ 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.");
}

}

@Override
Expand Down