From 9aa1798149d53b03a6c61d8fea40cf8948c5f506 Mon Sep 17 00:00:00 2001 From: "shaojin.wensj" Date: Tue, 19 Mar 2019 19:48:42 +0800 Subject: [PATCH] bug fixed for fail fast. --- .../druid/pool/DruidAbstractDataSource.java | 36 +++++++++++++++++-- .../alibaba/druid/pool/DruidDataSource.java | 14 +++++--- .../druid/bvt/pool/profile/FailFastTest.java | 16 ++++++++- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 75ff354085..3da39f81b9 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -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 failContinuousTimeMillisUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "failContinuousTimeMillis"); + final static AtomicIntegerFieldUpdater 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 { diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 862872f0a1..376d5c2cf0 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -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(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java b/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java index 4297488a5e..875465f2c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java @@ -4,6 +4,7 @@ import java.sql.SQLException; import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import com.alibaba.druid.PoolTestCase; @@ -17,7 +18,8 @@ import junit.framework.TestCase; public class FailFastTest extends PoolTestCase { private DruidDataSource dataSource; - + + private AtomicInteger index = new AtomicInteger(); private CountDownLatch latch = new CountDownLatch(1); @SuppressWarnings("serial") @@ -26,6 +28,11 @@ public class FailFastTest extends PoolTestCase { dataSource = new DruidDataSource() { public PhysicalConnectionInfo createPhysicalConnection() throws SQLException { + if (index.get() > 2) { + return super.createPhysicalConnection(); + } + + index.incrementAndGet(); try { latch.await(); } catch (InterruptedException e) { @@ -79,6 +86,13 @@ public class FailFastTest extends PoolTestCase { connectEndLatch.await(3, TimeUnit.SECONDS); SQLException ex = errorHolder.get(); Assert.assertTrue(ex instanceof DataSourceNotAvailableException); + + for (int i = 0; i < 300; ++i) { + if (!dataSource.isFailContinuous()) { + break; + } + Thread.sleep(100 * 1); + } } }