Adjust

Author: arturobernalg

httpcore5/src/test/java/org/apache/hc/core5/pool/ConnPoolContractFuzzer.java

@@ -40,8 +40,6 @@
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import org.apache.hc.core5.io.CloseMode;
 import org.apache.hc.core5.util.TimeValue;
@@ -50,6 +48,7 @@
 final class ConnPoolContractFuzzer {
 
     private static final Timeout REQUEST_TIMEOUT = Timeout.ofSeconds(30);
+    private static final Timeout NO_WAIT = Timeout.ofMilliseconds(0);
     private static final TimeValue IDLE_TIME = TimeValue.ofMilliseconds(1);
 
     private ConnPoolContractFuzzer() {
@@ -113,9 +112,10 @@ static void run(
                     case 1:
                     case 2: {
                         final String route = routes.get(rnd.nextInt(routes.size()));
-                        final Object state = (rnd.nextInt(4) == 0) ? null : rnd.nextInt(3);
+                        final Object state = (rnd.nextInt(4) == 0) ? null : Integer.valueOf(rnd.nextInt(3));
                         trace.add(step + ": lease(" + route + ", state=" + state + ")");
-                        final Future<PoolEntry<String, PoolTestSupport.DummyConn>> f = pool.lease(route, state, REQUEST_TIMEOUT, null);
+                        final Future<PoolEntry<String, PoolTestSupport.DummyConn>> f =
+                                pool.lease(route, state, REQUEST_TIMEOUT, null);
                         pending.add(new PendingLease(state, f));
                         break;
                     }
@@ -199,6 +199,9 @@ static void run(
                     }
                 }
 
+                // Drain again so invariants observe the same state we model.
+                drainDoneFutures(pending, leased, leasedSet);
+
                 assertCoreInvariants(pool);
 
                 if (poolType != PoolTestSupport.PoolType.LAX) {
@@ -212,6 +215,7 @@ static void run(
 
         } catch (final AssertionError ex) {
             fail("Pool=" + poolType + " seed=" + seed
+                    + "\nAssertion: " + ex.getMessage()
                     + "\nRepro: -Dhc.pool.fuzz.seed=" + seed
                     + "\nTrace(last 80):\n" + tail(trace, 80), ex);
         } finally {
@@ -250,33 +254,49 @@ private static void drainDoneFutures(
         }
     }
 
+    /**
+     * Fast, deterministic activity trigger. No waiting.
+     */
     private static void nudge(
             final ManagedConnPool<String, PoolTestSupport.DummyConn> pool,
             final List<String> routes) {
 
+        if (pool instanceof StrictConnPool) {
+            ((StrictConnPool<?, ?>) pool).validatePendingRequests();
+            return;
+        }
+        if (pool instanceof LaxConnPool) {
+            ((LaxConnPool<?, ?>) pool).validatePendingRequests();
+            return;
+        }
+
+        // OFFLOCK: avoid waiting and avoid enqueuing if saturated.
         for (final String route : routes) {
-            final Future<PoolEntry<String, PoolTestSupport.DummyConn>> f =
-                    pool.lease(route, null, Timeout.ofMilliseconds(200), null);
+            final PoolStats rs = pool.getStats(route);
+            final int max = pool.getMaxPerRoute(route);
+            if (max > 0 && rs.getLeased() + rs.getAvailable() >= max) {
+                continue;
+            }
+
+            final Future<PoolEntry<String, PoolTestSupport.DummyConn>> f = pool.lease(route, null, NO_WAIT, null);
+            if (!f.isDone()) {
+                f.cancel(true);
+                continue;
+            }
             try {
-                final PoolEntry<String, PoolTestSupport.DummyConn> entry = f.get(200, TimeUnit.MILLISECONDS);
+                final PoolEntry<String, PoolTestSupport.DummyConn> entry = f.get();
                 if (entry != null) {
                     if (!entry.hasConnection()) {
                         entry.assignConnection(new PoolTestSupport.DummyConn());
                     }
                     pool.release(entry, true);
                 }
-            } catch (final TimeoutException ex) {
-                f.cancel(true);
             } catch (final Exception ignore) {
                 // ignore
             }
         }
     }
 
-    /**
-     * Adjustment: cleanup must not drop futures that completed concurrently, otherwise we
-     * can leave a successfully leased entry unreleased and report a false “leak”.
-     */
     private static void cleanupAndAssertQuiescent(
             final PoolTestSupport.PoolType poolType,
             final ManagedConnPool<String, PoolTestSupport.DummyConn> pool,
@@ -298,7 +318,6 @@ private static void cleanupAndAssertQuiescent(
                 pool.release(e, true);
             }
 
-            // Drain any done futures we didn’t observe via drainDoneFutures (race window).
             for (final Iterator<PendingLease> it = pending.iterator(); it.hasNext(); ) {
                 final PendingLease p = it.next();
                 if (!p.future.isDone()) {
@@ -320,7 +339,6 @@ private static void cleanupAndAssertQuiescent(
                 }
             }
 
-            // Encourage flushing of cancelled waiters without using impl-specific APIs.
             nudge(pool, routes);
             pool.closeExpired();
             pool.closeIdle(IDLE_TIME);
@@ -344,12 +362,15 @@ private static void cleanupAndAssertQuiescent(
     }
 
     private static void assertCoreInvariants(final ManagedConnPool<String, PoolTestSupport.DummyConn> pool) {
+        assertTrue(pool.getMaxTotal() >= 0, "maxTotal negative");
+
         final PoolStats total = pool.getTotalStats();
         assertTrue(total.getLeased() >= 0, "total.leased");
         assertTrue(total.getPending() >= 0, "total.pending");
         assertTrue(total.getAvailable() >= 0, "total.available");
 
         for (final String route : pool.getRoutes()) {
+            assertTrue(pool.getMaxPerRoute(route) >= 0, "maxPerRoute negative");
             final PoolStats rs = pool.getStats(route);
             assertTrue(rs.getLeased() >= 0, "route.leased");
             assertTrue(rs.getPending() >= 0, "route.pending");