Skip to content

#6949 Fix Netty streaming completion guard #7114

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

Open
arnabnandy7 wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −4
Open

#6949 Fix Netty streaming completion guard #7114

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
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-NettyNIOAsyncHTTPClient-6949.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "Netty NIO Async HTTP Client",
"contributor": "",
"description": "Fix async streaming responses so channel-inactive errors are surfaced until the response has been finalized."
}
6 changes: 2 additions & 4 deletions ...-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.RESPONSE_CONTENT_LENGTH;
import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.RESPONSE_DATA_READ;
import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.RESPONSE_STATUS_CODE;
import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.STREAMING_COMPLETE_KEY;
import static software.amazon.awssdk.http.nio.netty.internal.utils.ExceptionHandlingUtils.tryCatch;
import static software.amazon.awssdk.http.nio.netty.internal.utils.ExceptionHandlingUtils.tryCatchFinally;

Expand Down Expand Up @@ -462,10 +461,9 @@ public void cancel() {
private void notifyIfResponseNotCompleted(ChannelHandlerContext handlerCtx) {
RequestContext requestCtx = handlerCtx.channel().attr(REQUEST_CONTEXT_KEY).get();
Boolean responseCompleted = handlerCtx.channel().attr(RESPONSE_COMPLETE_KEY).get();
Boolean isStreamingComplete = handlerCtx.channel().attr(STREAMING_COMPLETE_KEY).get();
handlerCtx.channel().attr(KEEP_ALIVE).set(false);

if (!Boolean.TRUE.equals(responseCompleted) && !Boolean.TRUE.equals(isStreamingComplete)) {
if (!Boolean.TRUE.equals(responseCompleted)) {
IOException err = new IOException(NettyUtils.closedChannelMessage(handlerCtx.channel()));
runAndLogError(handlerCtx.channel(), () -> "Fail to execute SdkAsyncHttpResponseHandler#onError",
() -> requestCtx.handler().onError(err));
Expand Down Expand Up @@ -514,4 +512,4 @@ public void onComplete() {
});
}
}
}
}
15 changes: 15 additions & 0 deletions ...nt/src/test/java/software/amazon/awssdk/http/nio/netty/internal/PublisherAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.EXECUTE_FUTURE_KEY;
import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.PROTOCOL_FUTURE;
import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.REQUEST_CONTEXT_KEY;
import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.STREAMING_COMPLETE_KEY;

import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.EmptyByteBuf;
Expand Down Expand Up @@ -315,6 +316,20 @@ public void onComplete() {
verify(channelPool).release(channel);
}

@Test
public void channelInactive_streamingCompleteButResponseNotComplete_shouldInvokeResponseHandler() {
channel.attr(STREAMING_COMPLETE_KEY).set(true);

nettyResponseHandler.channelInactive(ctx);

ArgumentCaptor<Throwable> errorCaptor = ArgumentCaptor.forClass(Throwable.class);
verify(responseHandler).onError(errorCaptor.capture());
assertThat(errorCaptor.getValue()).isInstanceOf(IOException.class);
assertThat(executeFuture).isCompletedExceptionally();
verify(ctx).close();
verify(channelPool).release(channel);
}

static final class TestSubscriber implements Subscriber<ByteBuffer> {

private Subscription subscription;
Expand Down