The HttpClientRequest implementation does have a mapping of HTTP closed exception when a timeout occurs so the client is signaled with a stream exception for better usability. Actually we can generify this for the generic reset exception case instead of just being for idle timeouts.

Author: vietj

src/main/java/io/vertx/core/http/impl/HttpClientRequestBase.java

@@ -45,7 +45,7 @@ public abstract class HttpClientRequestBase implements HttpClientRequest {
   private long currentTimeoutTimerId = -1;
   private long currentTimeoutMs;
   private long lastDataReceived;
-  private Throwable timeoutFired;
+  private Throwable reset;
 
   HttpClientRequestBase(HttpClientStream stream, PromiseInternal<HttpClientResponse> responsePromise, HttpMethod method, SocketAddress server, String host, int port, String uri) {
     this.stream = stream;
@@ -167,8 +167,8 @@ public synchronized HttpClientRequest setTimeout(long timeout) {
   }
 
   protected Throwable mapException(Throwable t) {
-    if (t instanceof HttpClosedException && timeoutFired != null) {
-      t = timeoutFired;
+    if (t instanceof HttpClosedException && reset != null) {
+      t = reset;
     }
     return t;
   }
@@ -196,7 +196,9 @@ void handlePush(HttpClientPush push) {
   }
 
   void handleResponse(HttpClientResponse resp) {
-    handleResponse(responsePromise, resp, cancelTimeout());
+    if (reset == null) {
+      handleResponse(responsePromise, resp, cancelTimeout());
+    }
   }
 
   abstract void handleResponse(Promise<HttpClientResponse> promise, HttpClientResponse resp, long timeoutMs);
@@ -228,7 +230,6 @@ private void handleTimeout(long timeoutMs) {
         }
       }
       cause = timeoutEx(timeoutMs, method, server, uri);
-      timeoutFired = cause;
     }
     reset(cause);
   }
@@ -253,7 +254,16 @@ public boolean reset(long code, Throwable cause) {
     return reset(new StreamResetException(code, cause));
   }
 
-  abstract boolean reset(Throwable cause);
+  private boolean reset(Throwable cause) {
+    synchronized (this) {
+      if (reset != null) {
+        return false;
+      }
+      reset = cause;
+    }
+    stream.reset(cause);
+    return true;
+  }
 
   @Override
   public HttpClientRequest response(Handler<AsyncResult<HttpClientResponse>> handler) {

src/main/java/io/vertx/core/http/impl/HttpClientRequestImpl.java

@@ -54,7 +54,6 @@ public class HttpClientRequestImpl extends HttpClientRequestBase implements Http
   private Handler<Throwable> exceptionHandler;
   private Function<HttpClientResponse, Future<HttpClientRequest>> redirectHandler;
   private boolean ended;
-  private Throwable reset;
   private boolean followRedirects;
   private int maxRedirects;
   private int numberOfRedirections;
@@ -297,18 +296,6 @@ public String traceOperation() {
     return traceOperation;
   }
 
-  @Override
-  boolean reset(Throwable cause) {
-    synchronized (this) {
-      if (reset != null) {
-        return false;
-      }
-      reset = cause;
-    }
-    stream.reset(cause);
-    return true;
-  }
-
   private void tryComplete() {
     endPromise.tryComplete();
   }
@@ -379,9 +366,6 @@ private void handleEarlyHints(MultiMap headers) {
   }
 
   void handleResponse(Promise<HttpClientResponse> promise, HttpClientResponse resp, long timeoutMs) {
-    if (reset != null) {
-      return;
-    }
     int statusCode = resp.statusCode();
     if (followRedirects && numberOfRedirections < maxRedirects && statusCode >= 300 && statusCode < 400) {
       Function<HttpClientResponse, Future<HttpClientRequest>> handler = redirectHandler;

src/main/java/io/vertx/core/http/impl/HttpClientRequestPushPromise.java

@@ -59,12 +59,6 @@ public HttpConnection connection() {
     return stream.connection();
   }
 
-  @Override
-  boolean reset(Throwable cause) {
-    stream.reset(cause);
-    return true;
-  }
-
   @Override
   public boolean isChunked() {
     return false;

src/test/java/io/vertx/core/http/Http2Test.java

@@ -1072,4 +1072,24 @@ public void testRstFloodProtection() throws Exception {
     }
     await();
   }
+
+  @Test
+  public void testStreamResetErrorMapping() throws Exception {
+    server.requestHandler(req -> {
+    });
+    startServer(testAddress);
+    client.request(requestOptions).onComplete(onSuccess(req -> {
+      req.exceptionHandler(err -> {
+        assertTrue(err instanceof StreamResetException);
+        StreamResetException sre = (StreamResetException) err;
+        assertEquals(10, sre.getCode());
+        testComplete();
+      });
+      // Force stream allocation
+      req.sendHead().onComplete(onSuccess(v -> {
+        req.reset(10);
+      }));
+    }));
+    await();
+  }
 }