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] 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;