Skip to content

core: server stream should not deliver halfClose() when call is immediately cancelled #9362

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

Merged
YifeiZhuang merged 2 commits into from
Jul 12, 2022
Merged

core: server stream should not deliver halfClose() when call is immediately cancelled #9362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
851ef71
Merge branch 'master' of https://github.com/grpc/grpc-java into serve…
YifeiZhuang Jul 11, 2022
7b1e45c
fix half close without request
YifeiZhuang Jul 11, 2022
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
4 changes: 2 additions & 2 deletions 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 @@ -224,8 +224,8 @@ public final void onStreamAllocated() {
@Override
public void deframerClosed(boolean hasPartialMessage) {
deframerClosed = true;
if (endOfStream) {
if (!immediateCloseRequested && hasPartialMessage) {
if (endOfStream && !immediateCloseRequested) {
if (hasPartialMessage) {
// We've received the entire stream and have data available but we don't have
// enough to read the next frame ... this is bad.
deframeFailed(
Expand Down
39 changes: 39 additions & 0 deletions core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import com.google.common.util.concurrent.SettableFuture;
import io.grpc.InternalStatus;
import io.grpc.Metadata;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.grpc.internal.AbstractServerStream.TransportState;
import io.grpc.internal.MessageFramerTest.ByteWritableBuffer;
import java.io.ByteArrayInputStream;
Expand Down Expand Up @@ -108,6 +110,43 @@ public void messagesAvailable(MessageProducer producer) {
assertNull("no message expected", streamListenerMessageQueue.poll());
}

@Test
public void noHalfCloseListenerOnCancellation() throws Exception {
final Queue<InputStream> streamListenerMessageQueue = new LinkedList<>();
final SettableFuture<Status> closedFuture = SettableFuture.create();

stream.transportState().setListener(new ServerStreamListenerBase() {
@Override
public void messagesAvailable(StreamListener.MessageProducer producer) {
InputStream message;
while ((message = producer.next()) != null) {
streamListenerMessageQueue.add(message);
}
}

@Override
public void halfClosed() {
if (streamListenerMessageQueue.isEmpty()) {
throw new StatusRuntimeException(Status.INTERNAL.withDescription(
"Half close without request"));
}
}

@Override
public void closed(Status status) {
closedFuture.set(status);
}
});

ReadableBuffer buffer = mock(ReadableBuffer.class);
when(buffer.readableBytes()).thenReturn(1);
stream.transportState().inboundDataReceived(buffer, true);
Status cancel = Status.CANCELLED.withDescription("DEADLINE EXCEEDED");
stream.transportState().transportReportStatus(cancel);
assertEquals(cancel, closedFuture.get(TIMEOUT_MS, TimeUnit.MILLISECONDS));
verify(buffer).close();
}

@Test
public void queuedBytesInDeframerShouldNotBlockComplete() throws Exception {
final SettableFuture<Status> closedFuture = SettableFuture.create();
Expand Down