mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
bug fixed for scheduler keepAlive support
This commit is contained in:
@@ -2113,6 +2113,8 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
|
||||
private Map<String, Object> vairiables;
|
||||
private Map<String, Object> globalVairiables;
|
||||
|
||||
long createTaskId;
|
||||
|
||||
public PhysicalConnectionInfo(Connection connection //
|
||||
, long connectStartNanos //
|
||||
, long connectedNanos //
|
||||
|
||||
@@ -42,6 +42,7 @@ import java.util.concurrent.Future;
|
||||
import java.util.concurrent.ScheduledFuture;
|
||||
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
|
||||
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
|
||||
import java.util.concurrent.locks.Lock;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
@@ -147,6 +148,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
private LogStatsThread logStatsThread;
|
||||
private int createTaskCount;
|
||||
|
||||
private volatile long createTaskIdSeed = 1L;
|
||||
private long[] createTasks;
|
||||
|
||||
private final CountDownLatch initedLatch = new CountDownLatch(2);
|
||||
|
||||
private volatile boolean enable = true;
|
||||
@@ -179,7 +183,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
= AtomicLongFieldUpdater.newUpdater(DruidDataSource.class, "connectErrorCount");
|
||||
protected static final AtomicLongFieldUpdater<DruidDataSource> resetCountUpdater
|
||||
= AtomicLongFieldUpdater.newUpdater(DruidDataSource.class, "resetCount");
|
||||
|
||||
protected static final AtomicLongFieldUpdater<DruidDataSource> createTaskIdSeedUpdater
|
||||
= AtomicLongFieldUpdater.newUpdater(DruidDataSource.class, "createTaskIdSeed");
|
||||
|
||||
public DruidDataSource(){
|
||||
this(false);
|
||||
@@ -918,9 +923,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
|
||||
if (createScheduler != null && asyncInit) {
|
||||
for (int i = 0; i < initialSize; ++i) {
|
||||
createTaskCount++;
|
||||
CreateConnectionTask task = new CreateConnectionTask(true);
|
||||
this.createSchedulerFuture = createScheduler.submit(task);
|
||||
submitCreateTask(true);
|
||||
}
|
||||
} else if (!asyncInit) {
|
||||
// init connections
|
||||
@@ -964,9 +967,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
// async fill to minIdle
|
||||
if (createScheduler != null) {
|
||||
for (int i = 0; i < minIdle; ++i) {
|
||||
createTaskCount++;
|
||||
CreateConnectionTask task = new CreateConnectionTask(true);
|
||||
this.createSchedulerFuture = createScheduler.submit(task);
|
||||
submitCreateTask(true);
|
||||
}
|
||||
} else {
|
||||
this.emptySignal();
|
||||
@@ -1004,6 +1005,55 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
}
|
||||
}
|
||||
|
||||
private void submitCreateTask(boolean initTask) {
|
||||
createTaskCount++;
|
||||
CreateConnectionTask task = new CreateConnectionTask(initTask);
|
||||
if (createTasks == null) {
|
||||
createTasks = new long[8];
|
||||
}
|
||||
|
||||
boolean putted = false;
|
||||
for (int i = 0; i < createTasks.length; ++i) {
|
||||
if (createTasks[i] == 0) {
|
||||
createTasks[i] = task.taskId;
|
||||
putted = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!putted) {
|
||||
long[] array = new long[createTasks.length * 3 / 2];
|
||||
System.arraycopy(createTasks, 0, array, 0, createTasks.length);
|
||||
array[createTasks.length] = task.taskId;
|
||||
createTasks = array;
|
||||
}
|
||||
|
||||
this.createSchedulerFuture = createScheduler.submit(task);
|
||||
}
|
||||
|
||||
private boolean clearCreateTask(long taskId) {
|
||||
if (createTasks == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (taskId == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (int i = 0; i < createTasks.length; i++) {
|
||||
if (createTasks[i] == taskId) {
|
||||
createTasks[i] = 0;
|
||||
createTaskCount--;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (LOG.isWarnEnabled()) {
|
||||
LOG.warn("clear create task failed : " + taskId);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private void createAndLogThread() {
|
||||
if (this.timeBetweenLogStatsMillis <= 0) {
|
||||
return;
|
||||
@@ -2323,7 +2373,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
lock.lock();
|
||||
try {
|
||||
if (createScheduler != null) {
|
||||
createTaskCount--;
|
||||
clearCreateTask(physicalConnectionInfo.createTaskId);
|
||||
}
|
||||
} finally {
|
||||
lock.unlock();
|
||||
@@ -2332,10 +2382,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
return false;
|
||||
}
|
||||
|
||||
return put(holder);
|
||||
return put(holder, physicalConnectionInfo.createTaskId);
|
||||
}
|
||||
|
||||
private boolean put(DruidConnectionHolder holder) {
|
||||
private boolean put(DruidConnectionHolder holder, long createTaskId) {
|
||||
lock.lock();
|
||||
try {
|
||||
if (poolingCount >= maxActive) {
|
||||
@@ -2353,7 +2403,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
notEmptySignalCount++;
|
||||
|
||||
if (createScheduler != null) {
|
||||
createTaskCount--;
|
||||
clearCreateTask(createTaskId);
|
||||
|
||||
if (poolingCount + createTaskCount < notEmptyWaitThreadCount //
|
||||
&& activeCount + poolingCount + createTaskCount < maxActive) {
|
||||
@@ -2370,12 +2420,18 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
|
||||
private int errorCount = 0;
|
||||
private boolean initTask = false;
|
||||
private long taskId;
|
||||
|
||||
public CreateConnectionTask() {
|
||||
init();
|
||||
}
|
||||
|
||||
private void init() {
|
||||
taskId = createTaskIdSeedUpdater.getAndIncrement(DruidDataSource.this);
|
||||
}
|
||||
|
||||
public CreateConnectionTask(boolean initTask) {
|
||||
init();
|
||||
this.initTask = initTask;
|
||||
}
|
||||
|
||||
@@ -2391,7 +2447,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
lock.lock();
|
||||
try {
|
||||
if (closed || closing) {
|
||||
createTaskCount--;
|
||||
clearCreateTask(taskId);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2404,17 +2460,17 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
if (emptyWait) {
|
||||
// 必须存在线程等待,才创建连接
|
||||
if (poolingCount >= notEmptyWaitThreadCount //
|
||||
&& (!(keepAlive && activeCount + poolingCount < minIdle))
|
||||
&& (!initTask)
|
||||
&& !isFailContinuous()
|
||||
&& (!(keepAlive && activeCount + poolingCount < minIdle)) // 在keepAlive场景不能放弃创建
|
||||
&& (!initTask) // 线程池初始化时的任务不能放弃创建
|
||||
&& !isFailContinuous() // failContinuous时不能放弃创建,否则会无法创建线程
|
||||
) {
|
||||
createTaskCount--;
|
||||
clearCreateTask(taskId);
|
||||
return;
|
||||
}
|
||||
|
||||
// 防止创建超过maxActive数量的连接
|
||||
if (activeCount + poolingCount >= maxActive) {
|
||||
createTaskCount--;
|
||||
clearCreateTask(taskId);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -2445,7 +2501,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
if (breakAfterAcquireFailure) {
|
||||
lock.lock();
|
||||
try {
|
||||
createTaskCount--;
|
||||
clearCreateTask(taskId);
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
@@ -2454,9 +2510,16 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
|
||||
this.errorCount = 0; // reset errorCount
|
||||
if (closing || closed) {
|
||||
createTaskCount--;
|
||||
lock.lock();
|
||||
try {
|
||||
clearCreateTask(taskId);
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
this.init();
|
||||
createSchedulerFuture = createScheduler.schedule(this, timeBetweenConnectErrorMillis, TimeUnit.MILLISECONDS);
|
||||
return;
|
||||
}
|
||||
@@ -2479,7 +2542,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
if (breakAfterAcquireFailure) {
|
||||
lock.lock();
|
||||
try {
|
||||
createTaskCount--;
|
||||
clearCreateTask(taskId);
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
@@ -2488,9 +2551,16 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
|
||||
this.errorCount = 0; // reset errorCount
|
||||
if (closing || closed) {
|
||||
createTaskCount--;
|
||||
lock.lock();
|
||||
try {
|
||||
clearCreateTask(taskId);
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
this.init();
|
||||
createSchedulerFuture = createScheduler.schedule(this, timeBetweenConnectErrorMillis, TimeUnit.MILLISECONDS);
|
||||
return;
|
||||
}
|
||||
@@ -2502,7 +2572,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
} catch (Error e) {
|
||||
lock.lock();
|
||||
try {
|
||||
createTaskCount--;
|
||||
clearCreateTask(taskId);
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
@@ -2519,6 +2589,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
continue;
|
||||
}
|
||||
|
||||
physicalConnection.createTaskId = taskId;
|
||||
boolean result = put(physicalConnection);
|
||||
if (!result) {
|
||||
JdbcUtils.close(physicalConnection.getPhysicalConnection());
|
||||
@@ -2964,7 +3035,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
boolean discard = !validate;
|
||||
if (validate) {
|
||||
holer.lastKeepTimeMillis = System.currentTimeMillis();
|
||||
boolean putOk = put(holer);
|
||||
boolean putOk = put(holer, 0L);
|
||||
if (!putOk) {
|
||||
discard = true;
|
||||
}
|
||||
@@ -3621,10 +3692,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
if (activeCount + poolingCount + createTaskCount >= maxActive) {
|
||||
return;
|
||||
}
|
||||
|
||||
createTaskCount++;
|
||||
CreateConnectionTask task = new CreateConnectionTask();
|
||||
this.createSchedulerFuture = createScheduler.submit(task);
|
||||
submitCreateTask(false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user