Fix Connection Closing on Timeout (Azure#17690)

* Close connection when timeout occurs

* Add CHANGELOG entry

Author: alzimmermsft

sdk/core/azure-core-http-netty/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## 1.7.0-beta.1 (Unreleased)
 
+### Bug Fixes
+
+- Fixed a bug where a connection would remain active when timed out instead of being closed.
 
 ## 1.6.3 (2020-10-29)
 

sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/implementation/ReadTimeoutHandler.java

@@ -23,6 +23,7 @@ public final class ReadTimeoutHandler extends ChannelInboundHandlerAdapter {
 
     private final long timeoutMillis;
 
+    private boolean closed;
     private long lastReadMillis;
     private ScheduledFuture<?> readTimeoutWatcher;
 
@@ -65,6 +66,10 @@ private void readTimeoutRunnable(ChannelHandlerContext ctx) {
         }
 
         // No progress has been made since the last timeout event, channel has timed out.
-        ctx.fireExceptionCaught(new TimeoutException(String.format(READ_TIMED_OUT_MESSAGE, timeoutMillis)));
+        if (!closed) {
+            ctx.fireExceptionCaught(new TimeoutException(String.format(READ_TIMED_OUT_MESSAGE, timeoutMillis)));
+            ctx.close();
+            closed = true;
+        }
     }
 }

sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/implementation/ResponseTimeoutHandler.java

@@ -23,6 +23,7 @@ public final class ResponseTimeoutHandler extends ChannelInboundHandlerAdapter {
 
     private final long timeoutMillis;
 
+    private boolean closed;
     private ScheduledFuture<?> responseTimeoutWatcher;
 
     /**
@@ -51,6 +52,10 @@ public void handlerRemoved(ChannelHandlerContext ctx) {
     }
 
     private void responseTimedOut(ChannelHandlerContext ctx) {
-        ctx.fireExceptionCaught(new TimeoutException(String.format(RESPONSE_TIMED_OUT_MESSAGE, timeoutMillis)));
+        if (!closed) {
+            ctx.fireExceptionCaught(new TimeoutException(String.format(RESPONSE_TIMED_OUT_MESSAGE, timeoutMillis)));
+            ctx.close();
+            closed = true;
+        }
     }
 }

sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/implementation/WriteTimeoutHandler.java

@@ -28,6 +28,7 @@ public final class WriteTimeoutHandler extends ChannelOutboundHandlerAdapter {
 
     private final long timeoutMillis;
 
+    private boolean closed;
     private long lastWriteMillis;
     private long lastWriteProgress;
     private ScheduledFuture<?> writeTimeoutWatcher;
@@ -83,6 +84,10 @@ private void writeTimeoutRunnable(ChannelHandlerContext ctx) {
         }
 
         // No progress has been made since the last timeout event, channel has timed out.
-        ctx.fireExceptionCaught(new TimeoutException(String.format(WRITE_TIMED_OUT_MESSAGE, timeoutMillis)));
+        if (!closed) {
+            ctx.fireExceptionCaught(new TimeoutException(String.format(WRITE_TIMED_OUT_MESSAGE, timeoutMillis)));
+            ctx.close();
+            closed = true;
+        }
     }
 }