diff --git a/pom.xml b/pom.xml index 2c28bf4501..515a69eb6d 100644 --- a/pom.xml +++ b/pom.xml @@ -286,6 +286,7 @@ 1.6.0 system ${toolsjar} + true diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index d309dadcfd..63b77a6138 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -113,13 +113,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat private final CountDownLatch initedLatch = new CountDownLatch(2); - private boolean enable = true; + private volatile boolean enable = true; private boolean resetStatEnable = true; private String initStackTrace; - private boolean closed = false; + private volatile boolean closed = false; private long closeTimeMillis = -1L; private JdbcDataSourceStat dataSourceStat; @@ -320,11 +320,14 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat throw new SQLException("interrupt", e); } + boolean init = false; try { if (inited) { return; } + init = true; + initStackTrace = IOUtils.toString(Thread.currentThread().getStackTrace()); this.id = DruidDriver.createDataSourceId(); @@ -343,10 +346,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat throw new IllegalArgumentException("illegal maxActive " + maxActive); } - if (maxIdle <= 0 || maxIdle < minIdle) { - throw new IllegalArgumentException("illegal maxPoolSize"); - } - if (getInitialSize() > maxActive) { throw new IllegalArgumentException("illegal initialSize " + this.initialSize + ", maxActieve " + maxActive); @@ -437,7 +436,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat inited = true; lock.unlock(); - if (LOG.isInfoEnabled()) { + if (init && LOG.isInfoEnabled()) { LOG.info("{dataSource-" + this.getID() + "} inited"); } } @@ -669,8 +668,20 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } private DruidPooledConnection getConnectionInternal(long maxWait) throws SQLException { - DruidPooledConnection poolalbeConnection; + if (closed) { + connectErrorCount.incrementAndGet(); + throw new DataSourceClosedException("dataSource already closed at " + new Date(closeTimeMillis)); + } + if (!enable) { + connectErrorCount.incrementAndGet(); + throw new DataSourceDisableException(); + } + + final long nanos = TimeUnit.MILLISECONDS.toNanos(maxWait); + final int maxWaitThreadCount = getMaxWaitThreadCount(); + + DruidConnectionHolder holder; try { lock.lockInterruptibly(); } catch (InterruptedException e) { @@ -679,17 +690,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } try { - if (closed) { - connectErrorCount.incrementAndGet(); - throw new DataSourceClosedException("dataSource already closed at " + new Date(closeTimeMillis)); - } - - if (!enable) { - connectErrorCount.incrementAndGet(); - throw new DataSourceDisableException(); - } - - final int maxWaitThreadCount = getMaxWaitThreadCount(); if (maxWaitThreadCount > 0) { if (notEmptyWaitThreadCount >= maxWaitThreadCount) { connectErrorCount.incrementAndGet(); @@ -700,26 +700,18 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat connectCount++; - DruidConnectionHolder holder; - if (maxWait > 0) { - holder = pollLast(maxWait, TimeUnit.MILLISECONDS); + holder = pollLast(nanos); } else { holder = takeLast(); } - if (holder == null) { - throw new SQLException("can not get connection"); - } - - holder.incrementUseCount(); activeCount++; if (activeCount > activePeak) { activePeak = activeCount; activePeakTime = System.currentTimeMillis(); } - poolalbeConnection = new DruidPooledConnection(holder); } catch (InterruptedException e) { connectErrorCount.incrementAndGet(); throw new SQLException(e.getMessage(), e); @@ -729,6 +721,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } finally { lock.unlock(); } + + holder.incrementUseCount(); + + DruidPooledConnection poolalbeConnection = new DruidPooledConnection(holder); return poolalbeConnection; } @@ -815,12 +811,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } + final long lastActiveTimeMillis = System.currentTimeMillis(); lock.lockInterruptibly(); try { activeCount--; closeCount++; - putLast(holder); + putLast(holder, lastActiveTimeMillis); recycleCount++; } finally { lock.unlock(); @@ -918,18 +915,18 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } - void putLast(DruidConnectionHolder e) throws SQLException { + void putLast(DruidConnectionHolder e, long lastActiveTimeMillis) throws SQLException { if (!enable) { discardConnection(e.getConnection()); return; } - e.setLastActiveTimeMillis(System.currentTimeMillis()); + e.setLastActiveTimeMillis(lastActiveTimeMillis); connections[poolingCount++] = e; if (poolingCount > poolingPeak) { poolingPeak = poolingCount; - poolingPeakTime = System.currentTimeMillis(); + poolingPeakTime = lastActiveTimeMillis; } notEmpty.signal(); @@ -950,7 +947,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat notEmptyWaitThreadCount--; } notEmptyWaitCount++; - + if (!enable) { connectErrorCount.incrementAndGet(); throw new DataSourceDisableException(); @@ -969,8 +966,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat return last; } - DruidConnectionHolder pollLast(long timeout, TimeUnit unit) throws InterruptedException, SQLException { - final long nanos = unit.toNanos(timeout); + DruidConnectionHolder pollLast(long nanos) throws InterruptedException, SQLException { long estimate = nanos; for (int i = 0;; ++i) { @@ -993,7 +989,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat // creator notEmptyWaitCount++; notEmptyWaitNanos += (startEstimate - estimate); - + if (!enable) { connectErrorCount.incrementAndGet(); throw new DataSourceDisableException(); @@ -1540,7 +1536,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat buf.append(entry.getKey().getSql()); buf.append("\""); buf.append("\t}"); - + entryIndex++; } } catch (ConcurrentModificationException e) { diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java index 79559a2df3..fbf6e386f8 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java @@ -15,10 +15,11 @@ */ package com.alibaba.druid.stat; -import com.alibaba.druid.pool.DruidDataSource; +import java.lang.management.ManagementFactory; import java.sql.Driver; import java.sql.DriverManager; import java.util.ArrayList; +import java.util.Date; import java.util.Enumeration; import java.util.LinkedHashMap; import java.util.List; @@ -27,6 +28,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; import com.alibaba.druid.VERSION; +import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.http.stat.WebAppStatManager; import com.alibaba.druid.support.spring.stat.SpringStatManager; import com.alibaba.druid.util.DruidDataSourceUtils; @@ -188,6 +190,10 @@ public class DruidStatManagerFacade { dataMap.put("Drivers", getDriversData()); dataMap.put("ResetEnable", isResetEnable()); dataMap.put("ResetCount", getResetCount()); + dataMap.put("JavaVMName", System.getProperty("java.vm.name")); + dataMap.put("JavaVersion", System.getProperty("java.version")); + dataMap.put("JavaClassPath", System.getProperty("java.class.path")); + dataMap.put("StartTime", new Date(ManagementFactory.getRuntimeMXBean().getStartTime())); return dataMap; } diff --git a/src/main/resources/support/http/resources/index.html b/src/main/resources/support/http/resources/index.html index 4e96fc6250..ec9f2730b0 100644 --- a/src/main/resources/support/http/resources/index.html +++ b/src/main/resources/support/http/resources/index.html @@ -23,7 +23,7 @@ - drivers + Drivers @@ -34,6 +34,22 @@ ResetCount + + JavaVersion + + + + JavaVMName + + + + JavaClassPath + + + + StartTime + +