mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
bug fixed for fail fast.
This commit is contained in:
@@ -1990,7 +1990,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
while (poolingCount == 0) {
|
||||
emptySignal(); // send signal to CreateThread create connection
|
||||
|
||||
if (failFast && failContinuous.get()) {
|
||||
if (failFast && isFailContinuous()) {
|
||||
throw new DataSourceNotAvailableException(createError);
|
||||
}
|
||||
|
||||
@@ -2030,7 +2030,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
if (poolingCount == 0) {
|
||||
emptySignal(); // send signal to CreateThread create connection
|
||||
|
||||
if (failFast && failContinuous.get()) {
|
||||
if (failFast && isFailContinuous()) {
|
||||
throw new DataSourceNotAvailableException(createError);
|
||||
}
|
||||
|
||||
@@ -2377,8 +2377,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
if (emptyWait) {
|
||||
// 必须存在线程等待,才创建连接
|
||||
if (poolingCount >= notEmptyWaitThreadCount //
|
||||
&& !(keepAlive && activeCount + poolingCount < minIdle)
|
||||
&& !initTask) {
|
||||
&& (!(keepAlive && activeCount + poolingCount < minIdle))
|
||||
&& (!initTask)
|
||||
&& !isFailContinuous()
|
||||
) {
|
||||
createTaskCount--;
|
||||
return;
|
||||
}
|
||||
@@ -2541,7 +2543,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
if (emptyWait) {
|
||||
// 必须存在线程等待,才创建连接
|
||||
if (poolingCount >= notEmptyWaitThreadCount //
|
||||
&& !(keepAlive && activeCount + poolingCount < minIdle)) {
|
||||
&& (!(keepAlive && activeCount + poolingCount < minIdle))
|
||||
&& !isFailContinuous()
|
||||
) {
|
||||
empty.await();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user