From 0666546a2f8cc74a4eff2ac124d7c203d76729ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Mon, 19 Aug 2019 16:32:33 +0800 Subject: [PATCH 1/9] recover fatal error --- pom.xml | 2 +- .../druid/pool/DruidAbstractDataSource.java | 47 +++++++++++++++++++ .../alibaba/druid/pool/DruidDataSource.java | 21 +++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5ce1a0a06..e56f054f1f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.19 + 1.1.20_preview_05 jar druid 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..1b361ccbc1 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1752,8 +1752,17 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat lastFatalErrorTimeMillis = lastErrorTimeMillis; onFatalError = true; + fatalErrorCount++; lastFatalError = error; lastFatalErrorSql = sql; + + ReentrantLock dataSourceLock = holder.getDataSource().lock; + dataSourceLock.lock(); + try { + emptySignal(); + } finally { + dataSourceLock.unlock(); + } } finally { lock.unlock(); } @@ -2975,11 +2984,23 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat return; } + int fatalErrorIncrement = fatalErrorCount - fatalErrorCountLastShrink; + fatalErrorCountLastShrink = fatalErrorCount; + final int checkCount = poolingCount - minIdle; final long currentTimeMillis = System.currentTimeMillis(); for (int i = 0; i < poolingCount; ++i) { DruidConnectionHolder connection = connections[i]; + if (onFatalError || fatalErrorIncrement > 0) { + if (lastFatalErrorTimeMillis < connection.lastActiveTimeMillis) { + keepAliveConnections[keepAliveCount++] = connection; + continue; + } else { + break; + } + } + if (checkTime) { if (phyTimeoutMillis > 0) { long phyConnectTimeMillis = currentTimeMillis - connection.connectTimeMillis; From 6b9b189d41709a8d7c33ef32b6394fdda59397f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Tue, 20 Aug 2019 19:52:54 +0800 Subject: [PATCH 2/9] recover fatal error --- pom.xml | 2 +- .../alibaba/druid/pool/DruidDataSource.java | 23 ++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index e56f054f1f..a1d3f19dda 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.20_preview_05 + 1.1.20_preview_06 jar druid diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 1b361ccbc1..e8398b29ff 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1740,6 +1740,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat sql = sql.substring(0, 1024); } + DruidAbstractDataSource dataSource = holder.getDataSource(); + boolean requireDiscard = false; final ReentrantLock lock = conn.lock; lock.lock(); @@ -1755,18 +1757,23 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat fatalErrorCount++; lastFatalError = error; lastFatalErrorSql = sql; - - ReentrantLock dataSourceLock = holder.getDataSource().lock; - dataSourceLock.lock(); - try { - emptySignal(); - } finally { - dataSourceLock.unlock(); - } } finally { lock.unlock(); } + if(dataSource != null) { + ReentrantLock dataSourceLock = dataSource.lock; + dataSourceLock.lock(); + try { + if (poolingCount < minIdle) { + emptySignal(); + } + } + finally { + dataSourceLock.unlock(); + } + } + if (requireDiscard) { if (holder.statementTrace != null) { holder.lock.lock(); From 22e962b17c15901b08867b8980d70741d2b90fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Tue, 20 Aug 2019 20:30:13 +0800 Subject: [PATCH 3/9] recover fatal error --- pom.xml | 2 +- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a1d3f19dda..4a7a6c0a06 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.20_preview_06 + 1.1.20_preview_07 jar druid diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index e8398b29ff..7feb4574b5 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1740,8 +1740,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat sql = sql.substring(0, 1024); } - DruidAbstractDataSource dataSource = holder.getDataSource(); - boolean requireDiscard = false; final ReentrantLock lock = conn.lock; lock.lock(); @@ -1761,8 +1759,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat lock.unlock(); } - if(dataSource != null) { - ReentrantLock dataSourceLock = dataSource.lock; + if(holder != null && holder.getDataSource() != null) { + ReentrantLock dataSourceLock = holder.getDataSource().lock; dataSourceLock.lock(); try { if (poolingCount < minIdle) { From 3943006477e50207f808ba6ec3032d9779f1f16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Tue, 20 Aug 2019 21:36:11 +0800 Subject: [PATCH 4/9] recover fatal error --- pom.xml | 2 +- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 5 ++++- .../java/com/alibaba/druid/pool/DruidPooledConnection.java | 1 + .../java/com/alibaba/druid/pool/DruidPooledStatement.java | 5 +++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4a7a6c0a06..e4b71292ff 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.20_preview_07 + 1.1.20_preview_08 jar druid diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 7feb4574b5..2d030cb856 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; @@ -2998,7 +3001,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat DruidConnectionHolder connection = connections[i]; if (onFatalError || fatalErrorIncrement > 0) { - if (lastFatalErrorTimeMillis < connection.lastActiveTimeMillis) { + if (lastFatalErrorTimeMillis > connection.lastActiveTimeMillis) { keepAliveConnections[keepAliveCount++] = connection; continue; } else { 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; From f32d83d55eba895f3b5d53567939e3d09ffb1c0f Mon Sep 17 00:00:00 2001 From: agapple Date: Wed, 21 Aug 2019 12:37:48 +0800 Subject: [PATCH 5/9] fixed onFatalError Recover --- pom.xml | 2 +- .../com/alibaba/druid/pool/DruidDataSource.java | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index e4b71292ff..8065fb534b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.20_preview_08 + 1.1.20_preview_09 jar druid diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 2d030cb856..0452d80672 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1762,13 +1762,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat lock.unlock(); } - if(holder != null && holder.getDataSource() != null) { + if(onFatalError && holder != null && holder.getDataSource() != null) { ReentrantLock dataSourceLock = holder.getDataSource().lock; dataSourceLock.lock(); try { - if (poolingCount < minIdle) { - emptySignal(); - } + emptySignal(); } finally { dataSourceLock.unlock(); @@ -3001,12 +2999,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat DruidConnectionHolder connection = connections[i]; if (onFatalError || fatalErrorIncrement > 0) { - if (lastFatalErrorTimeMillis > connection.lastActiveTimeMillis) { - keepAliveConnections[keepAliveCount++] = connection; - continue; - } else { - break; - } + keepAliveConnections[keepAliveCount++] = connection; + continue; } if (checkTime) { From 109f95be761f5b2397d69f1b9d58e5cfc7ba1cee Mon Sep 17 00:00:00 2001 From: agapple Date: Wed, 21 Aug 2019 13:06:13 +0800 Subject: [PATCH 6/9] fixed shrink --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 0452d80672..12f7ddbe04 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -2999,8 +2999,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat DruidConnectionHolder connection = connections[i]; if (onFatalError || fatalErrorIncrement > 0) { - keepAliveConnections[keepAliveCount++] = connection; - continue; + if (lastFatalErrorTimeMillis > connection.connectTimeMillis) { + keepAliveConnections[keepAliveCount++] = connection; + continue; + } else { + break; + } } if (checkTime) { From c2a8d3d7b24115c87550bad919d10aefea8f43fd Mon Sep 17 00:00:00 2001 From: agapple Date: Wed, 21 Aug 2019 13:13:29 +0800 Subject: [PATCH 7/9] fixed shrink bypass checkTime bug --- pom.xml | 2 +- .../java/com/alibaba/druid/pool/DruidDataSource.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 8065fb534b..34ef5dcb7a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.20_preview_09 + 1.1.20_preview_10 jar druid diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 12f7ddbe04..2e355b1de7 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -2998,13 +2998,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat for (int i = 0; i < poolingCount; ++i) { DruidConnectionHolder connection = connections[i]; - if (onFatalError || fatalErrorIncrement > 0) { - if (lastFatalErrorTimeMillis > connection.connectTimeMillis) { - keepAliveConnections[keepAliveCount++] = connection; - continue; - } else { - break; - } + if ((onFatalError || fatalErrorIncrement > 0) && (lastFatalErrorTimeMillis > connection.connectTimeMillis)) { + keepAliveConnections[keepAliveCount++] = connection; + continue; } if (checkTime) { From a8a2e60b9f60f93bac73cc58bf86b2de015b5450 Mon Sep 17 00:00:00 2001 From: agapple Date: Wed, 21 Aug 2019 18:19:03 +0800 Subject: [PATCH 8/9] fixed onFatalError emptySingle improve --- pom.xml | 6 +++--- .../alibaba/druid/pool/DruidDataSource.java | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 34ef5dcb7a..2f3e8c2d13 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.20_preview_10 + 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/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 2e355b1de7..f694275024 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1754,8 +1754,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } lastFatalErrorTimeMillis = lastErrorTimeMillis; - onFatalError = true; fatalErrorCount++; + if (fatalErrorCount - fatalErrorCountLastShrink > onFatalErrorMaxActive) { + onFatalError = true; + } lastFatalError = error; lastFatalErrorSql = sql; } finally { @@ -2498,6 +2500,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat && (!(keepAlive && activeCount + poolingCount < minIdle)) // 在keepAlive场景不能放弃创建 && (!initTask) // 线程池初始化时的任务不能放弃创建 && !isFailContinuous() // failContinuous时不能放弃创建,否则会无法创建线程 + && !isOnFatalError() // onFatalError时不能放弃创建,否则会无法创建线程 ) { clearCreateTask(taskId); return; @@ -2985,14 +2988,14 @@ 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; } - int fatalErrorIncrement = fatalErrorCount - fatalErrorCountLastShrink; - fatalErrorCountLastShrink = fatalErrorCount; - final int checkCount = poolingCount - minIdle; final long currentTimeMillis = System.currentTimeMillis(); for (int i = 0; i < poolingCount; ++i) { @@ -3127,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(); + } } } From 712d00e1d96e8ebf4b04d4468083548fd31ea986 Mon Sep 17 00:00:00 2001 From: agapple Date: Wed, 21 Aug 2019 20:32:05 +0800 Subject: [PATCH 9/9] fixed testcase failed --- .../alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest.java | 6 +++--- .../alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest_1.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) 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);