grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the race between failing and starting pending streams. 

Fixes #330
This commit is contained in:
Xudong Ma 2015-04-27 16:56:34 -07:00
parent 986d221eaa
commit 8a5d927a9a
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
okhttp/src/main/java/io/grpc/transport/okhttp/OkHttpClientTransport.java
View File

@ -279,19 +279,6 @@ public class OkHttpClientTransport implements ClientTransport {
return hasStreamStarted; return hasStreamStarted;
} }
private void failPendingStreams(Status status) {
LinkedList<PendingStream> streams;
synchronized (lock) {
streams = pendingStreams;
pendingStreams = new LinkedList<PendingStream>();
}
for (PendingStream stream : streams) {
stream.clientStream.transportReportStatus(
status, true, new Metadata.Trailers());
stream.createdFuture.set(null);
}
}
@Override @Override
public void start(Listener listener) { public void start(Listener listener) {
this.listener = Preconditions.checkNotNull(listener, "listener"); this.listener = Preconditions.checkNotNull(listener, "listener");
@ -368,6 +355,7 @@ public class OkHttpClientTransport implements ClientTransport {
private void onGoAway(int lastKnownStreamId, Status status) { private void onGoAway(int lastKnownStreamId, Status status) {
boolean notifyShutdown; boolean notifyShutdown;
ArrayList<OkHttpClientStream> goAwayStreams = new ArrayList<OkHttpClientStream>(); ArrayList<OkHttpClientStream> goAwayStreams = new ArrayList<OkHttpClientStream>();
List<PendingStream> pendingStreamsCopy;
synchronized (lock) { synchronized (lock) {
notifyShutdown = !goAway; notifyShutdown = !goAway;
goAway = true; goAway = true;
@ -382,6 +370,9 @@ public class OkHttpClientTransport implements ClientTransport {
} }
} }
} }
pendingStreamsCopy = pendingStreams;
pendingStreams = new LinkedList<PendingStream>();
} }
if (notifyShutdown) { if (notifyShutdown) {
@ -390,7 +381,12 @@ public class OkHttpClientTransport implements ClientTransport {
for (OkHttpClientStream stream : goAwayStreams) { for (OkHttpClientStream stream : goAwayStreams) {
stream.transportReportStatus(status, false, new Metadata.Trailers()); stream.transportReportStatus(status, false, new Metadata.Trailers());
} }
failPendingStreams(status);
for (PendingStream stream : pendingStreamsCopy) {
stream.clientStream.transportReportStatus(
status, true, new Metadata.Trailers());
stream.createdFuture.set(null);
}
stopIfNecessary(); stopIfNecessary();
} }