mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
add method : DruidDataSource.discardConnection(ConnectionHolder)
This commit is contained in:
@@ -1418,14 +1418,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
LOG.debug("skip not validate connection.");
|
||||
}
|
||||
|
||||
Connection realConnection = poolableConnection.conn;
|
||||
discardConnection(realConnection);
|
||||
discardConnection(poolableConnection.holder);
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
Connection realConnection = poolableConnection.conn;
|
||||
if (poolableConnection.conn.isClosed()) {
|
||||
discardConnection(null); // 传入null,避免重复关闭
|
||||
discardConnection(poolableConnection.holder); // 传入null,避免重复关闭
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -1462,7 +1460,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
LOG.debug("skip not validate connection.");
|
||||
}
|
||||
|
||||
discardConnection(realConnection);
|
||||
discardConnection(poolableConnection.holder);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -1512,6 +1510,35 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
}
|
||||
}
|
||||
|
||||
public void discardConnection(DruidConnectionHolder holder) {
|
||||
if (holder == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Connection conn = holder.getConnection();
|
||||
if (conn != null) {
|
||||
JdbcUtils.close(conn);
|
||||
}
|
||||
|
||||
lock.lock();
|
||||
try {
|
||||
if (holder.discard) {
|
||||
return;
|
||||
}
|
||||
|
||||
activeCount--;
|
||||
discardCount++;
|
||||
|
||||
holder.discard = true;
|
||||
|
||||
if (activeCount <= minIdle) {
|
||||
emptySignal();
|
||||
}
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
private DruidPooledConnection getConnectionInternal(long maxWait) throws SQLException {
|
||||
if (closed) {
|
||||
connectErrorCountUpdater.incrementAndGet(this);
|
||||
@@ -1761,7 +1788,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
lock.lock();
|
||||
try {
|
||||
if ((!conn.isClosed()) || !conn.isDisable()) {
|
||||
holder.setDiscard(true);
|
||||
conn.disable(error);
|
||||
requireDiscard = true;
|
||||
}
|
||||
@@ -1800,8 +1826,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
}
|
||||
}
|
||||
|
||||
this.discardConnection(holder.getConnection());
|
||||
holder.setDiscard(true);
|
||||
this.discardConnection(holder);
|
||||
}
|
||||
|
||||
LOG.error("discard connection", error);
|
||||
@@ -1874,7 +1899,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
}
|
||||
|
||||
if (phyMaxUseCount > 0 && holder.useCount >= phyMaxUseCount) {
|
||||
discardConnection(holder.conn);
|
||||
discardConnection(holder);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1908,7 +1933,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
}
|
||||
|
||||
if (!enable) {
|
||||
discardConnection(holder.conn);
|
||||
discardConnection(holder);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1918,7 +1943,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
if (phyTimeoutMillis > 0) {
|
||||
long phyConnectTimeMillis = currentTimeMillis - holder.connectTimeMillis;
|
||||
if (phyConnectTimeMillis > phyTimeoutMillis) {
|
||||
discardConnection(holder.conn);
|
||||
discardConnection(holder);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1942,7 +1967,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
holder.clearStatementCache();
|
||||
|
||||
if (!holder.discard) {
|
||||
this.discardConnection(physicalConnection);
|
||||
discardConnection(holder);
|
||||
holder.discard = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user