diff --git a/pom.xml b/pom.xml
index ef73041106..f900a844c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.alibaba
druid
- 1.1.17_preview_4
+ 1.1.17_preview_6
jar
druid
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 489256f82d..7eb5184305 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -1043,6 +1043,14 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (createTasks[i] == taskId) {
createTasks[i] = 0;
createTaskCount--;
+
+ if (createTaskCount < 0) {
+ createTaskCount = 0;
+ }
+
+ if (createTaskCount == 0 && createTasks.length > 8) {
+ createTasks = new long[8];
+ }
return true;
}
}
@@ -2581,6 +2589,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
setFailContinuous(true);
break;
} catch (Throwable e) {
+ lock.lock();
+ try {
+ clearCreateTask(taskId);
+ } finally {
+ lock.unlock();
+ }
+
LOG.error("create connection unexecpted error.", e);
break;
}
@@ -2942,6 +2957,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
return;
}
+ boolean needFill = false;
int evictCount = 0;
int keepAliveCount = 0;
try {
@@ -3000,6 +3016,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
poolingCount -= removeCount;
}
keepAliveCheckCount += keepAliveCount;
+
+ if (keepAlive && poolingCount + activeCount < minIdle) {
+ needFill = true;
+ }
} finally {
lock.unlock();
}
@@ -3063,6 +3083,18 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.getDataSourceStat().addKeepAliveCheckCount(keepAliveCount);
Arrays.fill(keepAliveConnections, null);
}
+
+ if (needFill) {
+ lock.lock();
+ try {
+ int fillCount = minIdle - (activeCount + poolingCount + createTaskCount);
+ for (int i = 0; i < fillCount; ++i) {
+ emptySignal();
+ }
+ } finally {
+ lock.unlock();
+ }
+ }
}
public int getWaitThreadCount() {