recover fatal error

This commit is contained in:
高铁
2019-08-19 16:32:33 +08:00
parent 4b2df57add
commit 0666546a2f
3 changed files with 69 additions and 1 deletions
@@ -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
@@ -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;