bug fixed for fail fast.

This commit is contained in:
shaojin.wensj
2019-03-19 19:48:42 +08:00
parent c8ffb82508
commit 9aa1798149
3 changed files with 57 additions and 9 deletions
@@ -39,6 +39,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
@@ -266,10 +267,14 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
private boolean asyncCloseConnectionEnable = false;
protected int maxCreateTaskCount = 3;
protected boolean failFast = false;
protected AtomicBoolean failContinuous = new AtomicBoolean(false);
protected volatile int failContinuous = 0;
protected volatile long failContinuousTimeMillis = 0L;
protected ScheduledExecutorService destroyScheduler;
protected ScheduledExecutorService createScheduler;
final static AtomicLongFieldUpdater<DruidAbstractDataSource> failContinuousTimeMillisUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "failContinuousTimeMillis");
final static AtomicIntegerFieldUpdater<DruidAbstractDataSource> failContinuousUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "failContinuous");
protected boolean initVariants = false;
protected boolean initGlobalVariants = false;
protected volatile boolean onFatalError = false;
@@ -1702,9 +1707,34 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
lock.unlock();
}
}
public boolean isFailContinuous() {
return failContinuousUpdater.get(this) == 1;
}
protected void setFailContinuous(boolean fail) {
failContinuous.set(fail);
if (fail) {
failContinuousTimeMillisUpdater.set(this, System.currentTimeMillis());
} else {
failContinuousTimeMillisUpdater.set(this, 0L);
}
boolean currentState = failContinuousUpdater.get(this) == 1;
if (currentState == fail) {
return;
}
if (fail) {
failContinuousUpdater.set(this, 1);
if (LOG.isInfoEnabled()) {
LOG.info("{dataSource-" + this.getID() + "} failContinuous is true");
}
} else {
failContinuousUpdater.set(this, 0);
if (LOG.isInfoEnabled()) {
LOG.info("{dataSource-" + this.getID() + "} failContinuous is false");
}
}
}
public void initPhysicalConnection(Connection conn) throws SQLException {
@@ -1990,7 +1990,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
while (poolingCount == 0) {
emptySignal(); // send signal to CreateThread create connection
if (failFast && failContinuous.get()) {
if (failFast && isFailContinuous()) {
throw new DataSourceNotAvailableException(createError);
}
@@ -2030,7 +2030,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (poolingCount == 0) {
emptySignal(); // send signal to CreateThread create connection
if (failFast && failContinuous.get()) {
if (failFast && isFailContinuous()) {
throw new DataSourceNotAvailableException(createError);
}
@@ -2377,8 +2377,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (emptyWait) {
// 必须存在线程等待,才创建连接
if (poolingCount >= notEmptyWaitThreadCount //
&& !(keepAlive && activeCount + poolingCount < minIdle)
&& !initTask) {
&& (!(keepAlive && activeCount + poolingCount < minIdle))
&& (!initTask)
&& !isFailContinuous()
) {
createTaskCount--;
return;
}
@@ -2541,7 +2543,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (emptyWait) {
// 必须存在线程等待,才创建连接
if (poolingCount >= notEmptyWaitThreadCount //
&& !(keepAlive && activeCount + poolingCount < minIdle)) {
&& (!(keepAlive && activeCount + poolingCount < minIdle))
&& !isFailContinuous()
) {
empty.await();
}