bug fixed for keepAlive

This commit is contained in:
shaojin.wensj
2019-04-06 15:28:58 +08:00
parent 4eb2d11d73
commit daef1b47cf
4 changed files with 72 additions and 11 deletions
@@ -407,6 +407,17 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.setKeepAlive(value);
}
}
{
String property = properties.getProperty("druid.keepAliveBetweenTimeMillis");
if (property != null && property.length() > 0) {
try {
long value = Long.parseLong(property);
this.setKeepAliveBetweenTimeMillis(value);
} catch (NumberFormatException e) {
LOG.error("illegal property 'druid.keepAliveBetweenTimeMillis'", e);
}
}
}
{
Boolean value = getBoolean(properties, "druid.poolPreparedStatements");
if (value != null) {
@@ -1354,8 +1365,15 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
if (testWhileIdle) {
final DruidConnectionHolder holder = poolableConnection.holder;
long currentTimeMillis = System.currentTimeMillis();
long lastActiveTimeMillis = poolableConnection.holder.lastActiveTimeMillis;
long lastActiveTimeMillis = holder.lastActiveTimeMillis;
long lastKeepTimeMillis = holder.lastKeepTimeMillis;
if (lastKeepTimeMillis > lastActiveTimeMillis) {
lastActiveTimeMillis = lastKeepTimeMillis;
}
long idleMillis = currentTimeMillis - lastActiveTimeMillis;
long timeBetweenEvictionRunsMillis = this.timeBetweenEvictionRunsMillis;
@@ -1863,6 +1881,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
* close datasource
*/
public void close() {
if (LOG.isInfoEnabled()) {
LOG.info("{dataSource-" + this.getID() + "} closing ...");
}
lock.lock();
try {
if (this.closed) {
@@ -2666,6 +2688,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
public class DestroyTask implements Runnable {
public DestroyTask() {
}
@Override
public void run() {
@@ -2869,15 +2894,23 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
long idleMillis = currentTimeMillis - connection.lastActiveTimeMillis;
if (idleMillis < minEvictableIdleTimeMillis) {
if (idleMillis < minEvictableIdleTimeMillis
&& idleMillis < keepAliveBetweenTimeMillis
) {
break;
}
if (checkTime && i < checkCount) {
evictConnections[evictCount++] = connection;
} else if (idleMillis > maxEvictableIdleTimeMillis) {
evictConnections[evictCount++] = connection;
} else if (keepAlive) {
if (idleMillis >= minEvictableIdleTimeMillis) {
if (checkTime && i < checkCount) {
evictConnections[evictCount++] = connection;
continue;
} else if (idleMillis > maxEvictableIdleTimeMillis) {
evictConnections[evictCount++] = connection;
continue;
}
}
if (keepAlive && idleMillis >= keepAliveBetweenTimeMillis) {
keepAliveConnections[keepAliveCount++] = connection;
}
} else {
@@ -2911,7 +2944,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
if (keepAliveCount > 0) {
this.getDataSourceStat().addKeepAliveCheckCount(keepAliveCount);
// keep order
for (int i = keepAliveCount - 1; i >= 0; --i) {
DruidConnectionHolder holer = keepAliveConnections[i];
@@ -2931,7 +2963,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
boolean discard = !validate;
if (validate) {
holer.lastActiveTimeMillis = System.currentTimeMillis();
holer.lastKeepTimeMillis = System.currentTimeMillis();
boolean putOk = put(holer);
if (!putOk) {
discard = true;
@@ -2957,6 +2989,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
}
}
this.getDataSourceStat().addKeepAliveCheckCount(keepAliveCount);
Arrays.fill(keepAliveConnections, null);
}
}
@@ -3134,6 +3167,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (connHolder.lastActiveTimeMillis > 0) {
map.put("lastActiveTime", new Date(connHolder.lastActiveTimeMillis));
}
if (connHolder.lastKeepTimeMillis > 0) {
map.put("lastKeepTimeMillis", new Date(connHolder.lastKeepTimeMillis));
}
map.put("connectTime", new Date(connHolder.getTimeMillis()));
map.put("holdability", connHolder.getUnderlyingHoldability());
map.put("transactionIsolation", connHolder.getUnderlyingTransactionIsolation());