Skip to content

TransportSet shutdown() also shuts down the pending transport. #1882

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.

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

Merged
merged 1 commit into from
May 31, 2016
Merged
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
15 changes: 15 additions & 0 deletions core/src/main/java/io/grpc/internal/TransportSet.java
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ final class TransportSet implements WithLogId {
private final Collection<ManagedClientTransport> transports =
new ArrayList<ManagedClientTransport>();

/**
* The to-be active transport, which is not ready yet.
*/
@GuardedBy("lock")
@Nullable
private ManagedClientTransport pendingTransport;

private final LoadBalancer<ClientTransport> loadBalancer;

@GuardedBy("lock")
Expand Down Expand Up @@ -194,6 +201,7 @@ private void startNewTransport(DelayedClientTransport delayedTransport) {
log.log(Level.FINE, "[{0}] Created {1} for {2}",
new Object[] {getLogId(), transport.getLogId(), address});
}
pendingTransport = transport;
transports.add(transport);
transport.start(new TransportListener(transport, delayedTransport, address));
}
Expand Down Expand Up @@ -257,6 +265,7 @@ public ClientTransport get() {
*/
final void shutdown() {
ManagedClientTransport savedActiveTransport;
ManagedClientTransport savedPendingTransport;
boolean runCallback = false;
synchronized (lock) {
if (shutdown) {
Expand All @@ -265,6 +274,7 @@ final void shutdown() {
// Transition to SHUTDOWN
shutdown = true;
savedActiveTransport = activeTransport;
savedPendingTransport = pendingTransport;
activeTransport = null;
if (transports.isEmpty()) {
runCallback = true;
Expand All @@ -274,6 +284,9 @@ final void shutdown() {
if (savedActiveTransport != null) {
savedActiveTransport.shutdown();
}
if (savedPendingTransport != null) {
savedPendingTransport.shutdown();
}
if (runCallback) {
callback.onTerminated();
}
Expand Down Expand Up @@ -358,7 +371,9 @@ public void transportReady() {
"Unexpected non-null activeTransport");
} else if (activeTransport == delayedTransport) {
// Transition to READY
Preconditions.checkState(pendingTransport == transport, "transport mismatch");
activeTransport = transport;
pendingTransport = null;
}
}
delayedTransport.setTransport(transport);
Expand Down
16 changes: 16 additions & 0 deletions core/src/test/java/io/grpc/internal/TransportSetTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,22 @@ public void shutdownBeforeTransportCreatedWithoutPendingStream() throws Exceptio
assertEquals(0, transports.size());
}

@Test
public void shutdownBeforeTransportReady() throws Exception {
SocketAddress addr = mock(SocketAddress.class);
createTransportSet(addr);

ClientTransport pick = transportSet.obtainActiveTransport();
MockClientTransportInfo transportInfo = transports.poll();
assertNotSame(transportInfo.transport, pick);

// Shutdown the TransportSet before the pending transport is ready
transportSet.shutdown();

// The transport should've been shut down even though it's not the active transport yet.
verify(transportInfo.transport).shutdown();
}

@Test
public void obtainTransportAfterShutdown() throws Exception {
SocketAddress addr = mock(SocketAddress.class);
Expand Down