From 1ad43926ff4a26f344d12154a5b52f9b5723bb04 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 2 Mar 2018 15:25:33 +0800 Subject: [PATCH] improved async init. --- .../alibaba/druid/pool/DruidDataSource.java | 27 +++++++++--- .../bvt/pool/AsyncInitTest_1_scheduler.java | 44 +++++++++++++++++++ 2 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest_1_scheduler.java diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index bcce903b4e..24645e4de1 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -846,11 +846,16 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat SQLException connectError = null; - boolean asyncInit = this.asyncInit && createScheduler == null; - if (!asyncInit) { + if (createScheduler != null) { + for (int i = 0; i < initialSize; ++i) { + createTaskCount++; + CreateConnectionTask task = new CreateConnectionTask(true); + this.createSchedulerFuture = createScheduler.submit(task); + } + } else if (!asyncInit) { try { // init connections - for (int i = 0, size = getInitialSize(); i < size; ++i) { + for (int i = 0; i < initialSize; ++i) { PhysicalConnectionInfo pyConnectInfo = createPhysicalConnection(); DruidConnectionHolder holder = new DruidConnectionHolder(this, pyConnectInfo); connections[poolingCount] = holder; @@ -886,7 +891,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat if (createScheduler != null) { for (int i = 0; i < minIdle; ++i) { createTaskCount++; - CreateConnectionTask task = new CreateConnectionTask(); + CreateConnectionTask task = new CreateConnectionTask(true); this.createSchedulerFuture = createScheduler.submit(task); } } else { @@ -2231,7 +2236,16 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat public class CreateConnectionTask implements Runnable { - private int errorCount = 0; + private int errorCount = 0; + private boolean initTask = false; + + public CreateConnectionTask() { + + } + + public CreateConnectionTask(boolean initTask) { + this.initTask = initTask; + } @Override public void run() { @@ -2258,7 +2272,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat if (emptyWait) { // 必须存在线程等待,才创建连接 if (poolingCount >= notEmptyWaitThreadCount // - && !(keepAlive && activeCount + poolingCount < minIdle)) { + && !(keepAlive && activeCount + poolingCount < minIdle) + && !initTask) { createTaskCount--; return; } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest_1_scheduler.java b/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest_1_scheduler.java new file mode 100644 index 0000000000..ac498b3f01 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest_1_scheduler.java @@ -0,0 +1,44 @@ +package com.alibaba.druid.bvt.pool; + +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; + +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; + +public class AsyncInitTest_1_scheduler extends PoolTestCase { + private DruidDataSource dataSource; + private ScheduledExecutorService scheduler; + + protected void setUp() throws Exception { + super.setUp(); + + dataSource = new DruidDataSource(); + dataSource.setAsyncInit(true); + dataSource.setUrl("jdbc:mock:xxx"); + dataSource.setInitialSize(10); + dataSource.setMaxActive(10); + + scheduler = Executors.newScheduledThreadPool(2); + dataSource.setCreateScheduler(scheduler); + } + + protected void tearDown() throws Exception { + dataSource.close(); + + super.tearDown(); + } + + public void test_async_init() throws Exception { + dataSource.init(); + + for (int i = 0; i < 1000; ++i) { + if (dataSource.getPoolingCount() == dataSource.getInitialSize()) { + break; + } + Thread.sleep(10); + } + assertEquals(10, dataSource.getPoolingCount()); + assertEquals(10, dataSource.getCreateCount()); + } +}