Issue #6254 - Total timeout not enforced for queued requests.

Updates after review. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · May 11, 2021 · 88ac104 · 88ac104
1 parent da50e06
commit 88ac104
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java
@@ -567,14 +567,15 @@ public void onTimeoutExpired()
                 LOG.debug("{} timeouts check", this);
 
             long now = System.nanoTime();
-
+            long earliest = Long.MAX_VALUE;
             // Reset the earliest timeout so we can expire again.
             // A concurrent call to schedule(long) may lose an earliest
             // value, but the corresponding exchange is already enqueued
             // and will be seen by scanning the exchange queue below.
-            earliestTimeout.set(Long.MAX_VALUE);
+            earliestTimeout.set(earliest);
 
-            long earliest = Long.MAX_VALUE;
+            // Scan the message queue to abort expired exchanges
+            // and to find the exchange that expire the earliest.
             for (HttpExchange exchange : exchanges)
             {
                 HttpRequest request = exchange.getRequest();
@@ -596,8 +597,8 @@ private void schedule(long expiresAt)
             // Schedule a timeout for the earliest exchange that may expire.
             // When the timeout expires, scan the exchange queue for the next
             // earliest exchange that may expire, and reschedule a new timeout.
-            long earliest = earliestTimeout.getAndUpdate(t -> Math.min(t, expiresAt));
-            if (expiresAt < earliest)
+            long prevEarliest = earliestTimeout.getAndUpdate(t -> Math.min(t, expiresAt));
+            if (expiresAt < prevEarliest)
             {
                 // A new request expires earlier than previous requests, schedule it.
                 long delay = Math.max(0, expiresAt - System.nanoTime());

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java b/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java
@@ -119,10 +119,12 @@ public boolean schedule(long delay, TimeUnit units)
             if (_timeout.compareAndSet(timeout, new Timeout(newTimeoutAt, wakeup)))
             {
                 if (LOG.isDebugEnabled())
+                {
                     LOG.debug("Installed timeout in {} ms, {} wake up in {} ms",
                         units.toMillis(delay),
                         newWakeup != null ? "new" : "existing",
                         TimeUnit.NANOSECONDS.toMillis(wakeup._at - now));
+                }
                 break;
             }
         }