#9237 make startThread set shrinkThreshold in the future to guarante…

…e at least one idleTimeout period without shrinking Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Mar 28, 2023 · 47247d9 · 47247d9
1 parent 1669716
commit 47247d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
@@ -864,7 +864,7 @@ protected void startThread()
                 LOG.debug("Starting {}", thread);
             _threads.add(thread);
             // Update the shrink threshold to prevent thrashing
-            _shrinkThreshold.set(NanoTime.now());
+            _shrinkThreshold.set(NanoTime.now() + TimeUnit.MILLISECONDS.toNanos(_idleTimeout));
             thread.start();
             started = true;
         }
@@ -1092,7 +1092,7 @@ public String toString()
         int idle = Math.max(0, AtomicBiInteger.getLo(count));
         int queue = getQueueSize();
 
-        return String.format("%s[%s]@%x{%s,%d<=%d<=%d,i=%d,r=%d,q=%d}[%s]",
+        return String.format("%s[%s]@%x{%s,%d<=%d<=%d,i=%d,r=%d,t=%d,q=%d}[%s]",
             getClass().getSimpleName(),
             _name,
             hashCode(),
@@ -1102,6 +1102,7 @@ public String toString()
             getMaxThreads(),
             idle,
             getReservedThreads(),
+            NanoTime.millisUntil(_shrinkThreshold.get()),
             queue,
             _tryExecutor);
     }

diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/QueuedThreadPoolTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/QueuedThreadPoolTest.java
@@ -41,6 +41,7 @@
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -1114,7 +1115,8 @@ public void testShrinkCount() throws Exception
         tp.setMaxThreads(maxThreads);
         int idleTimeout = 1000;
         tp.setIdleTimeout(idleTimeout);
-        tp.setMaxShrinkCount(3);
+        int shrinkCount = 3;
+        tp.setMaxShrinkCount(shrinkCount);
         tp.start();
 
         waitForThreads(tp, minThreads);
@@ -1135,7 +1137,7 @@ public void testShrinkCount() throws Exception
 
         assertEquals(maxThreads, tp.getThreads());
 
-        Thread.sleep(idleTimeout + idleTimeout / 2);
+        Thread.sleep(idleTimeout * 2 + idleTimeout / 2);
         assertEquals(maxThreads - tp.getMaxShrinkCount(), tp.getThreads());
 
         Thread.sleep(idleTimeout);