Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

DruidDataSource support failFast

Browse Source
This commit is contained in:
高铁
2016-02-02 22:13:46 +08:00
parent 1dfe8112a7
commit 1554d2bce6
4 changed files with 148 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DataSourceNotAvailableException.java
+14
View File
@@ -0,0 +1,14 @@
package com.alibaba.druid.pool;
import java.sql.SQLException;
public class DataSourceNotAvailableException extends SQLException {
private static final long serialVersionUID = 1L;
public DataSourceNotAvailableException(Throwable cause){
super(cause);
}
}
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+25 -9
View File
@@ -244,6 +244,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
private boolean asyncCloseConnectionEnable = false;
protected int maxCreateTaskCount = 3;
protected boolean failFast = false;
protected ScheduledExecutorService destroyScheduler;
protected ScheduledExecutorService createScheduler;
@@ -1454,16 +1455,10 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
createError = null;
} catch (SQLException ex) {
createErrorCount.incrementAndGet();
createError = ex;
lastCreateError = ex;
lastCreateErrorTimeMillis = System.currentTimeMillis();
setCreateError(ex);
throw ex;
} catch (RuntimeException ex) {
createErrorCount.incrementAndGet();
createError = ex;
lastCreateError = ex;
lastCreateErrorTimeMillis = System.currentTimeMillis();
setCreateError(ex);
throw ex;
} catch (Error ex) {
createErrorCount.incrementAndGet();
@@ -1476,6 +1471,19 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
return new PhysicalConnectionInfo(conn, connectStartNanos, connectedNanos, initedNanos, validatedNanos);
}
protected void setCreateError(Throwable ex) {
createErrorCount.incrementAndGet();
long now = System.currentTimeMillis();
lock.lock();
try {
createError = ex;
lastCreateError = ex;
lastCreateErrorTimeMillis = now;
} finally {
lock.unlock();
}
}
public void initPhysicalConnection(Connection conn) throws SQLException {
if (conn.getAutoCommit() != defaultAutoCommit) {
conn.setAutoCommit(defaultAutoCommit);
@@ -1758,7 +1766,15 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
this.maxCreateTaskCount = maxCreateTaskCount;
}
static class PhysicalConnectionInfo {
public boolean isFailFast() {
return failFast;
}
public void setFailFast(boolean failFast) {
this.failFast = failFast;
}
public static class PhysicalConnectionInfo {
private Connection connection;
private long connectStartNanos;
private long connectedNanos;
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+33 -1
View File
@@ -277,6 +277,12 @@ public class DruidDataSource extends DruidAbstractDataSource
}
}
}
{
Boolean value = getBoolean(properties, "druid.failFast");
if (value != null) {
this.setFailFast(value);
}
}
}
public boolean isUseGlobalDataSourceStat() {
@@ -1450,6 +1456,10 @@ public class DruidDataSource extends DruidAbstractDataSource
DruidConnectionHolder takeLast() throws InterruptedException, SQLException {
try {
while (poolingCount == 0) {
if (failFast && createError != null) {
throw new DataSourceNotAvailableException(createError);
}
emptySignal(); // send signal to CreateThread create connection
notEmptyWaitThreadCount++;
if (notEmptyWaitThreadCount > notEmptyWaitThreadPeak) {
@@ -1461,7 +1471,7 @@ public class DruidDataSource extends DruidAbstractDataSource
notEmptyWaitThreadCount--;
}
notEmptyWaitCount++;
if (!enable) {
connectErrorCount.incrementAndGet();
throw new DataSourceDisableException();
@@ -1485,6 +1495,10 @@ public class DruidDataSource extends DruidAbstractDataSource
for (;;) {
if (poolingCount == 0) {
if (failFast && createError != null) {
throw new DataSourceNotAvailableException(createError);
}
emptySignal(); // send signal to CreateThread create connection
if (estimate <= 0) {
@@ -1810,6 +1824,15 @@ public class DruidDataSource extends DruidAbstractDataSource
LOG.error("create connection error, url: " + jdbcUrl, e);
errorCount++;
if (failFast) {
lock.lock();
try {
notEmpty.signalAll();
} finally {
lock.lock();
}
}
if (errorCount > connectionErrorRetryAttempts && timeBetweenConnectErrorMillis > 0) {
if (breakAfterAcquireFailure) {
@@ -1897,6 +1920,15 @@ public class DruidDataSource extends DruidAbstractDataSource
LOG.error("create connection error, url: " + jdbcUrl, e);
errorCount++;
if (failFast) {
lock.lock();
try {
notEmpty.signalAll();
} finally {
lock.unlock();
}
}
if (errorCount > connectionErrorRetryAttempts && timeBetweenConnectErrorMillis > 0) {
if (breakAfterAcquireFailure) {