Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 14 additions & 4 deletions core/src/main/java/io/grpc/internal/InternalSubchannel.java
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,20 @@ private void startNewTransport() {
TransportLogger transportLogger = new TransportLogger();
// In case the transport logs in the constructor, use the subchannel logId
transportLogger.logId = getLogId();
ConnectionClientTransport transport =
new CallTracingTransport(
transportFactory
.newClientTransport(address, options, transportLogger), callsTracer);
ConnectionClientTransport rawTransport;
try {
rawTransport =
transportFactory.newClientTransport(address, options, transportLogger);
} catch (IllegalStateException e) {
channelLogger.log(
ChannelLogLevel.WARNING, "Transport factory is closed, shutting down subchannel", e);
shutdown(
Status.UNAVAILABLE
.withDescription("Transport factory is closed")
.withCause(e));
return;
}
ConnectionClientTransport transport = new CallTracingTransport(rawTransport, callsTracer);
transportLogger.logId = transport.getLogId();
channelz.addClientSocket(transport);
pendingTransport = transport;
Expand Down
15 changes: 15 additions & 0 deletions core/src/test/java/io/grpc/internal/InternalSubchannelTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1671,6 +1671,21 @@ public void subchannelStateChanges_backendServiceFallsBackToResolutionResultAttr
);
}

@Test
public void transportFactoryClosed_shutsDownSubchannelSafely() {
SocketAddress addr = mock(SocketAddress.class);
createInternalSubchannel(addr);
assertEquals(IDLE, internalSubchannel.getState());

when(mockTransportFactory.newClientTransport(any(), any(), any()))
.thenThrow(new IllegalStateException("The transport factory is closed."));

assertNull(internalSubchannel.obtainActiveTransport());
assertExactCallbackInvokes(
"onStateChange:CONNECTING", "onStateChange:SHUTDOWN", "onTerminated");
assertEquals(SHUTDOWN, internalSubchannel.getState());
}

private void assertNoCallbackInvoke() {
while (fakeExecutor.runDueTasks() > 0) {}
assertEquals(0, callbackInvokes.size());
Expand Down
Loading