diff --git a/pom.xml b/pom.xml index b5ce1a0a06..2f3e8c2d13 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.19 + 1.1.20_preview_11 jar druid @@ -16,8 +16,8 @@ 4.12 1.19 - false - false + true + true UTF-8 1.6 diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 747e434fea..1e76d94d27 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -280,6 +280,8 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements protected boolean initGlobalVariants = false; protected volatile boolean onFatalError = false; protected volatile int onFatalErrorMaxActive = 0; + protected volatile int fatalErrorCount = 0; + protected volatile int fatalErrorCountLastShrink = 0; protected volatile long lastFatalErrorTimeMillis = 0; protected volatile String lastFatalErrorSql = null; protected volatile Throwable lastFatalError = null; @@ -1382,6 +1384,17 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements Exception error = null; try { result = validConnectionChecker.isValidConnection(conn, validationQuery, validationQueryTimeout); + + if (result && onFatalError) { + lock.lock(); + try { + if (onFatalError) { + onFatalError = false; + } + } finally { + lock.unlock(); + } + } } catch (SQLException ex) { throw ex; } catch (Exception ex) { @@ -1409,6 +1422,18 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements if (!rs.next()) { throw new SQLException("validationQuery didn't return a row"); } + + if (onFatalError) { + lock.lock(); + try { + if (onFatalError) { + onFatalError = false; + } + } + finally { + lock.unlock(); + } + } } finally { JdbcUtils.close(rs); JdbcUtils.close(stmt); @@ -1458,6 +1483,17 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements } } + if (valid && onFatalError) { + lock.lock(); + try { + if (onFatalError) { + onFatalError = false; + } + } finally { + lock.unlock(); + } + } + return valid; } @@ -1485,6 +1521,17 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements JdbcUtils.close(stmt); } + if (onFatalError) { + lock.lock(); + try { + if (onFatalError) { + onFatalError = false; + } + } finally { + lock.unlock(); + } + } + return true; } catch (Throwable ex) { // skip diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 8e29afeb82..f694275024 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1691,6 +1691,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat public void handleConnectionException(DruidPooledConnection pooledConnection, Throwable t, String sql) throws SQLException { final DruidConnectionHolder holder = pooledConnection.getConnectionHolder(); + if (holder == null) { + return; + } errorCountUpdater.incrementAndGet(this); lastError = t; @@ -1751,13 +1754,27 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } lastFatalErrorTimeMillis = lastErrorTimeMillis; - onFatalError = true; + fatalErrorCount++; + if (fatalErrorCount - fatalErrorCountLastShrink > onFatalErrorMaxActive) { + onFatalError = true; + } lastFatalError = error; lastFatalErrorSql = sql; } finally { lock.unlock(); } + if(onFatalError && holder != null && holder.getDataSource() != null) { + ReentrantLock dataSourceLock = holder.getDataSource().lock; + dataSourceLock.lock(); + try { + emptySignal(); + } + finally { + dataSourceLock.unlock(); + } + } + if (requireDiscard) { if (holder.statementTrace != null) { holder.lock.lock(); @@ -2483,6 +2500,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat && (!(keepAlive && activeCount + poolingCount < minIdle)) // 在keepAlive场景不能放弃创建 && (!initTask) // 线程池初始化时的任务不能放弃创建 && !isFailContinuous() // failContinuous时不能放弃创建,否则会无法创建线程 + && !isOnFatalError() // onFatalError时不能放弃创建,否则会无法创建线程 ) { clearCreateTask(taskId); return; @@ -2970,6 +2988,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat boolean needFill = false; int evictCount = 0; int keepAliveCount = 0; + int fatalErrorIncrement = fatalErrorCount - fatalErrorCountLastShrink; + fatalErrorCountLastShrink = fatalErrorCount; + try { if (!inited) { return; @@ -2980,6 +3001,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat for (int i = 0; i < poolingCount; ++i) { DruidConnectionHolder connection = connections[i]; + if ((onFatalError || fatalErrorIncrement > 0) && (lastFatalErrorTimeMillis > connection.connectTimeMillis)) { + keepAliveConnections[keepAliveCount++] = connection; + continue; + } + if (checkTime) { if (phyTimeoutMillis > 0) { long phyConnectTimeMillis = currentTimeMillis - connection.connectTimeMillis; @@ -3104,6 +3130,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } finally { lock.unlock(); } + } else if (onFatalError || fatalErrorIncrement > 0) { + lock.lock(); + try { + emptySignal(); + } finally { + lock.unlock(); + } } } diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java index a6b3afbda7..f0245c1d03 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java @@ -147,6 +147,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql. public void closePoolableStatement(DruidPooledPreparedStatement stmt) throws SQLException { PreparedStatement rawStatement = stmt.getRawPreparedStatement(); + final DruidConnectionHolder holder = this.holder; if (holder == null) { return; } diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java index 32875cb8df..d2b3417064 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java @@ -98,8 +98,9 @@ public class DruidPooledStatement extends PoolableWrapper implements Statement { DruidDataSource dataSource = null; - if (this.conn.holder.dataSource instanceof DruidDataSource) { - dataSource = (DruidDataSource) this.conn.holder.dataSource; + final DruidConnectionHolder holder = this.conn.holder; + if (holder.dataSource instanceof DruidDataSource) { + dataSource = (DruidDataSource) holder.dataSource; } if (dataSource == null) { return; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest.java b/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest.java index 75f0b3e581..cfd16401bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest.java @@ -30,10 +30,10 @@ public class OnFatalErrorMaxActiveTest extends PoolTestCase { Field field = DruidAbstractDataSource.class.getDeclaredField("onFatalError"); field.setAccessible(true); - SQLException faltalError = new SQLException(); - { + SQLException faltalError = null; + for ( int i = 0; i < 2; i++) { + faltalError = new SQLException(); Connection conn = dataSource.getConnection(); - Method method = DruidDataSource.class.getDeclaredMethod("handleFatalError", DruidPooledConnection.class, SQLException.class, String.class); method.setAccessible(true); method.invoke(dataSource, conn.unwrap(DruidPooledConnection.class), faltalError, "select 'x'"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest_1.java b/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest_1.java index 9df3475698..48b2c4c105 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest_1.java @@ -30,8 +30,9 @@ public class OnFatalErrorMaxActiveTest_1 extends PoolTestCase { Field field = DruidAbstractDataSource.class.getDeclaredField("onFatalError"); field.setAccessible(true); - SQLException faltalError = new SQLException(); - { + SQLException faltalError = null; + for ( int i = 0; i < 2; i++) { + faltalError = new SQLException(); Connection conn = dataSource.getConnection(); Method method = DruidDataSource.class.getDeclaredMethod("handleFatalError", DruidPooledConnection.class, SQLException.class, String.class);