merge: #8554

8554: [Backport stable/1.3] fix(atomix/netty): remove open future when request times out r=oleschoenburg a=github-actions[bot] # Description Backport of #8550 to `stable/1.3`. relates to #8541 Co-authored-by: Roman <roman.smirnov@camunda.com>
camunda · Jan 7, 2022 · 0730107 · 0730107
2 parents 59fb529 + c984bb1
commit 0730107
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/atomix/cluster/src/main/java/io/atomix/cluster/messaging/impl/NettyMessagingService.java b/atomix/cluster/src/main/java/io/atomix/cluster/messaging/impl/NettyMessagingService.java
@@ -220,11 +220,13 @@ public CompletableFuture<byte[]> sendAndReceive(
 
     final var timeoutFuture =
         timeoutExecutor.schedule(
-            () ->
-                responseFuture.completeExceptionally(
-                    new TimeoutException(
-                        String.format(
-                            "Request %s to %s timed out in %s", message, address, timeout))),
+            () -> {
+              responseFuture.completeExceptionally(
+                  new TimeoutException(
+                      String.format(
+                          "Request %s to %s timed out in %s", message, address, timeout)));
+              openFutures.remove(responseFuture);
+            },
             timeout.toNanos(),
             TimeUnit.NANOSECONDS);
     responseFuture.whenComplete((ignored, error) -> timeoutFuture.cancel(true));