Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1072 from wenshao/master

Browse Source 
bug fixed for DruidDataSource fail-fast
This commit is contained in:
wenshao
2016-02-05 12:56:48 +08:00
parent 6cdc9df754 43d13ffb10
commit cdbec1d4f8
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+3 -1
View File
@@ -1475,7 +1475,9 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
if (ex == null) {
lock.lock();
try {
createError = null;
if (createError != null) {
createError = null;
}
} finally {
lock.unlock();
}
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+22 -13
View File
@@ -1460,11 +1460,12 @@ public class DruidDataSource extends DruidAbstractDataSource
try {
while (poolingCount == 0) {
emptySignal(); // send signal to CreateThread create connection
if (failFast && createError != null) {
throw new DataSourceNotAvailableException(createError);
}
emptySignal(); // send signal to CreateThread create connection
notEmptyWaitThreadCount++;
if (notEmptyWaitThreadCount > notEmptyWaitThreadPeak) {
notEmptyWaitThreadPeak = notEmptyWaitThreadCount;
@@ -1498,12 +1499,12 @@ public class DruidDataSource extends DruidAbstractDataSource
long estimate = nanos;
for (;;) {
if (failFast && createError != null) {
throw new DataSourceNotAvailableException(createError);
}
if (poolingCount == 0) {
emptySignal(); // send signal to CreateThread create connection
if (failFast && createError != null) {
throw new DataSourceNotAvailableException(createError);
}
if (estimate <= 0) {
waitNanosLocal.set(nanos - estimate);
@@ -1897,15 +1898,23 @@ public class DruidDataSource extends DruidAbstractDataSource
}
try {
// 必须存在线程等待，才创建连接
if (poolingCount >= notEmptyWaitThreadCount) {
empty.await();
boolean emptyWait = true;
if (createError != null && poolingCount == 0) {
emptyWait = false;
}
// 防止创建超过maxActive数量的连接
if (activeCount + poolingCount >= maxActive) {
empty.await();
continue;
if (emptyWait) {
// 必须存在线程等待，才创建连接
if (poolingCount >= notEmptyWaitThreadCount) {
empty.await();
}
// 防止创建超过maxActive数量的连接
if (activeCount + poolingCount >= maxActive) {
empty.await();
continue;
}
}
} catch (InterruptedException e) {