diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index dad199045d..7a48789287 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -122,6 +122,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements protected volatile int maxPoolPreparedStatementPerConnectionSize = 10; protected volatile boolean inited = false; + protected volatile boolean initExceptionThrow = true; protected PrintWriter logWriter = new PrintWriter(System.out); diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 95eba5d89e..d50e769295 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -26,7 +26,6 @@ import java.sql.Statement; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -855,23 +854,27 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat this.createSchedulerFuture = createScheduler.submit(task); } } else if (!asyncInit) { - try { // init connections - for (int i = 0; i < initialSize; ++i) { - PhysicalConnectionInfo pyConnectInfo = createPhysicalConnection(); - DruidConnectionHolder holder = new DruidConnectionHolder(this, pyConnectInfo); - connections[poolingCount] = holder; - incrementPoolingCount(); + while (poolingCount < initialSize) { + try { + PhysicalConnectionInfo pyConnectInfo = createPhysicalConnection(); + DruidConnectionHolder holder = new DruidConnectionHolder(this, pyConnectInfo); + connections[poolingCount++] = holder; + } catch (SQLException ex) { + LOG.error("init datasource error, url: " + this.getUrl(), ex); + if (initExceptionThrow) { + connectError = ex; + break; + } else { + Thread.sleep(3000); + } + } } if (poolingCount > 0) { poolingPeak = poolingCount; poolingPeakTime = System.currentTimeMillis(); } - } catch (SQLException ex) { - LOG.error("init datasource error, url: " + this.getUrl(), ex); - connectError = ex; - } } createAndLogThread();