Reuse HTTP/2 connections that receive a 5xx error

Author: zoewangg

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/response/ResponseHandlerHelper.java

@@ -20,7 +20,6 @@
 import software.amazon.awssdk.crt.http.HttpHeader;
 import software.amazon.awssdk.crt.http.HttpHeaderBlock;
 import software.amazon.awssdk.crt.http.HttpStream;
-import software.amazon.awssdk.http.HttpStatusFamily;
 import software.amazon.awssdk.http.SdkHttpResponse;
 
 /**

http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/BaseHttpStreamResponseHandlerTest.java

@@ -77,7 +77,6 @@ void serverError_shouldShutdownConnection() {
         responseHandler.onResponseHeadersDone(httpStream, 0);
         responseHandler.onResponseComplete(httpStream, 0);
         requestFuture.join();
-        verify(crtConn).shutdown();
         verify(crtConn).close();
         verify(httpStream).close();
     }
@@ -121,7 +120,6 @@ void streamClosed_shouldNotIncreaseStreamWindow() throws InterruptedException {
 
         responseHandler.onResponseComplete(httpStream, 0);
         requestFuture.join();
-        verify(crtConn).shutdown();
         verify(crtConn).close();
         verify(httpStream).close();
         verify(httpStream, never()).incrementWindow(anyInt());

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2ToHttpInboundAdapter.java

@@ -16,7 +16,6 @@
 package software.amazon.awssdk.http.nio.netty.internal.http2;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultHttpContent;
@@ -32,7 +31,6 @@
 import io.netty.handler.codec.http2.HttpConversionUtil;
 import java.io.IOException;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.http.HttpStatusFamily;
 import software.amazon.awssdk.http.nio.netty.internal.utils.NettyClientLogger;
 
 /**
@@ -62,20 +60,6 @@ private void onHeadersRead(Http2HeadersFrame headersFrame, ChannelHandlerContext
 
         HttpResponse httpResponse = HttpConversionUtil.toHttpResponse(headersFrame.stream().id(), headersFrame.headers(), true);
         ctx.fireChannelRead(httpResponse);
-
-        if (HttpStatusFamily.of(httpResponse.status().code()) == HttpStatusFamily.SERVER_ERROR) {
-            fireConnectionExceptionForServerError(ctx);
-        }
-    }
-
-    private void fireConnectionExceptionForServerError(ChannelHandlerContext ctx) {
-        if (ctx.channel().parent() != null) {
-            Channel parent = ctx.channel().parent();
-            log.debug(ctx.channel(),
-                      () -> "A 5xx server error occurred on an Http2 stream, notifying the connection channel " + ctx.channel());
-            parent.pipeline().fireExceptionCaught(new Http2ConnectionTerminatingException("A 5xx server error occurred on an "
-                                                                                          + "Http2 stream " + ctx.channel()));
-        }
     }
 
     private void onDataRead(Http2DataFrame dataFrame, ChannelHandlerContext ctx) throws Http2Exception {

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/H2ServerErrorTest.java

@@ -88,13 +88,13 @@ public void teardown() throws InterruptedException {
     }
 
     @Test
-    public void serviceReturn500_newRequestShouldUseNewConnection() {
+    public void serviceReturn500_newRequestShouldReuseConnection() {
         server.return500OnFirstRequest = true;
         CompletableFuture<?> firstRequest = sendGetRequest(server.port(), netty);
         firstRequest.join();
 
         sendGetRequest(server.port(), netty).join();
-        assertThat(server.h2ConnectionCount.get()).isEqualTo(2);
+        assertThat(server.h2ConnectionCount.get()).isEqualTo(1);
     }
 
     @Test