|
|
|
@ -92,14 +92,14 @@ public class PoolConfig {
|
|
|
|
|
this.properties = properties;
|
|
|
|
|
this.minIdle = -1;
|
|
|
|
|
this.maxPoolSize = -1;
|
|
|
|
|
this.maxLifetime = TimeUnit.MINUTES.toMillis(30);
|
|
|
|
|
this.connectionTimeout = TimeUnit.SECONDS.toMillis(30);
|
|
|
|
|
this.validationTimeout = TimeUnit.SECONDS.toMillis(5);
|
|
|
|
|
this.maxLifetime = TimeUnit.MINUTES.toMillis(60);
|
|
|
|
|
this.connectionTimeout = TimeUnit.SECONDS.toMillis(15);
|
|
|
|
|
this.validationTimeout = TimeUnit.SECONDS.toMillis(15);
|
|
|
|
|
this.idleTimeout = TimeUnit.MINUTES.toMillis(1);
|
|
|
|
|
this.initializationFailTimeout = -1;
|
|
|
|
|
this.isAutoCommit = true; // JDBC convention
|
|
|
|
|
this.aliveBypassWindowMs = TimeUnit.MILLISECONDS.toMillis(500);
|
|
|
|
|
this.housekeepingPeriodMs = TimeUnit.SECONDS.toMillis(30);
|
|
|
|
|
this.housekeepingPeriodMs = TimeUnit.SECONDS.toMillis(60);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -639,13 +639,11 @@ public class PoolConfig {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (connectionTimeout < 250) {
|
|
|
|
|
logger.log(Level.WARNING, "connectionTimeout is less than 250ms, setting to ms: " +
|
|
|
|
|
poolName + " " + TimeUnit.MILLISECONDS.toMillis(250));
|
|
|
|
|
logger.log(Level.WARNING, poolName + " connectionTimeout is less than 250ms, setting to " + TimeUnit.MILLISECONDS.toMillis(250) + " ms");
|
|
|
|
|
connectionTimeout = TimeUnit.MILLISECONDS.toMillis(250);
|
|
|
|
|
}
|
|
|
|
|
if (validationTimeout < 250) {
|
|
|
|
|
logger.log(Level.WARNING, "validationTimeout is less than 250ms, setting to ms" +
|
|
|
|
|
poolName + " " + TimeUnit.MILLISECONDS.toMillis(250));
|
|
|
|
|
logger.log(Level.WARNING, poolName + " validationTimeout is less than 250ms, setting to ms" + TimeUnit.MILLISECONDS.toMillis(250) + " ms");
|
|
|
|
|
validationTimeout = TimeUnit.MILLISECONDS.toMillis(250);
|
|
|
|
|
}
|
|
|
|
|
if (maxPoolSize < 1) {
|
|
|
|
@ -655,14 +653,13 @@ public class PoolConfig {
|
|
|
|
|
minIdle = maxPoolSize;
|
|
|
|
|
}
|
|
|
|
|
if (idleTimeout + TimeUnit.SECONDS.toMillis(1) > maxLifetime && maxLifetime > 0 && minIdle < maxPoolSize) {
|
|
|
|
|
logger.log(Level.WARNING, "idleTimeout is close to or more than maxLifetime, disabling it:" + poolName);
|
|
|
|
|
logger.log(Level.WARNING, poolName + " idleTimeout is close to or more than maxLifetime, disabling it");
|
|
|
|
|
idleTimeout = 0;
|
|
|
|
|
} else if (idleTimeout != 0 && idleTimeout < TimeUnit.SECONDS.toMillis(10) && minIdle < maxPoolSize) {
|
|
|
|
|
logger.log(Level.WARNING, "idleTimeout is less than 10s, setting to default ms: " +
|
|
|
|
|
poolName + " " + TimeUnit.SECONDS.toMillis(10));
|
|
|
|
|
logger.log(Level.WARNING, poolName + " idleTimeout is less than 10s, setting to default " + TimeUnit.SECONDS.toMillis(10) + " ms");
|
|
|
|
|
idleTimeout = TimeUnit.SECONDS.toMillis(10);
|
|
|
|
|
} else if (idleTimeout != TimeUnit.SECONDS.toMillis(10) && idleTimeout != 0 && minIdle == maxPoolSize) {
|
|
|
|
|
logger.log(Level.WARNING, "idleTimeout has been set but has no effect because the pool is operating as a fixed size pool: " + poolName);
|
|
|
|
|
logger.log(Level.WARNING, poolName + " idleTimeout has been set but has no effect because the pool is operating as a fixed size pool");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|