Skip to content
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

Jump to bottom

core: always call StreamTracer.streamClosed() when stream is officially closed #4331

Merged
merged 1 commit into from
Apr 12, 2018
Merged

core: always call StreamTracer.streamClosed() when stream is officially closed #4331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/src/main/java/io/grpc/internal/AbstractServerStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ public final void close(Status status, Metadata trailers) {
Preconditions.checkNotNull(trailers, "trailers");
if (!outboundClosed) {
outboundClosed = true;
statsTraceCtx.streamClosed(status);
endOfMessages();
addStatusToTrailers(trailers, status);
// Safe to set without synchronization because access is tightly controlled.
Expand Down Expand Up @@ -336,6 +335,7 @@ private void closeListener(Status newStatus) {
statsTraceCtx.streamClosed(newStatus);
getTransportTracer().reportStreamClosed(false);
} else {
statsTraceCtx.streamClosed(closedStatus);
getTransportTracer().reportStreamClosed(closedStatus.isOk());
}
listenerClosed = true;
Expand Down
2 changes: 1 addition & 1 deletion testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,10 +776,10 @@ public void basicStream() throws Exception {
trailers.put(asciiKey, "dupvalue");
trailers.put(binaryKey, "äbinarytrailers");
serverStream.close(status, trailers);
assertSame(status, serverStreamTracer1.getStatus());
assertNull(serverStreamTracer1.nextInboundEvent());
assertNull(serverStreamTracer1.nextOutboundEvent());
assertCodeEquals(Status.OK, serverStreamListener.status.get(TIMEOUT_MS, TimeUnit.MILLISECONDS));
assertSame(status, serverStreamTracer1.getStatus());
Status clientStreamStatus = clientStreamListener.status.get(TIMEOUT_MS, TimeUnit.MILLISECONDS);
Metadata clientStreamTrailers =
clientStreamListener.trailers.get(TIMEOUT_MS, TimeUnit.MILLISECONDS);
Expand Down