diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index bf2713a3..8dd68ee0 100644 --- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -443,7 +443,10 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL final long maxLifetime = config.getMaxLifetime(); if (maxLifetime > 0) { // Determines the random variance max ceiling, from 10 seconds to 2.5% of the maxlifetime whichever is bigger. - final long randomIntervalInMillis = maxLifetime > 10_000 ? Math.max(10_000, maxLifetime / 40) : 0; + final long maxIntervalInMillis = maxLifetime > 10_000 ? Math.max(10_000, maxLifetime / 40) : 0; + + // Randomize the current max interval + final long randomIntervalInMillis = maxIntervalInMillis > 0 ? ThreadLocalRandom.current().nextLong(maxIntervalInMillis) : 0; final long lifetime = maxLifetime - randomIntervalInMillis; poolEntry.setFutureEol(houseKeepingExecutorService.schedule(new Runnable() { @Override