From 6ce53e3203ffe9a0c9050dd69a27b1312a035e6d Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 21 Sep 2018 16:24:21 +0800 Subject: [PATCH] add more error info. --- .../druid/pool/DruidAbstractDataSource.java | 3 ++ .../alibaba/druid/pool/DruidDataSource.java | 10 ++++ .../alibaba/druid/bvt/pool/MaxWaitTest.java | 46 +++++++++++++++++++ .../alibaba/druid/bvt/pool/UrlNotSetTest.java | 31 +++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/pool/MaxWaitTest.java create mode 100644 src/test/java/com/alibaba/druid/bvt/pool/UrlNotSetTest.java diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 9148b62ff7..546a04ba66 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -240,12 +240,14 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements protected volatile int directCreateCount = 0; protected volatile long createCount = 0L; protected volatile long destroyCount = 0L; + protected volatile long createStartNanos = 0L; final static AtomicIntegerFieldUpdater createErrorCountUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "createErrorCount"); final static AtomicIntegerFieldUpdater creatingCountUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "creatingCount"); final static AtomicIntegerFieldUpdater directCreateCountUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "directCreateCount"); final static AtomicLongFieldUpdater createCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "createCount"); final static AtomicLongFieldUpdater destroyCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "destroyCount"); + final static AtomicLongFieldUpdater createStartNanosUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "createStartNanos"); private Boolean useUnfairLock = null; private boolean useLocalSessionState = true; @@ -1628,6 +1630,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements ? new HashMap() : null; + createStartNanosUpdater.set(this, connectStartNanos); creatingCountUpdater.incrementAndGet(this); try { conn = createPhysicalConnection(url, physicalConnectProperties); diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 3821ad408f..a2cf6cbafb 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -813,6 +813,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat if (MockDriver.class.getName().equals(driverClass)) { driver = MockDriver.instance; } else { + if (jdbcUrl == null && (driverClass == null || driverClass.length() == 0)) { + throw new SQLException("url not set"); + } driver = JdbcUtils.createDriver(driverClassLoader, driverClass); } } else { @@ -1373,6 +1376,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat for (boolean createDirect = false;;) { if (createDirect) { + createStartNanosUpdater.set(this, System.nanoTime()); if (creatingCountUpdater.compareAndSet(this, 0, 1)) { PhysicalConnectionInfo pyConnInfo = DruidDataSource.this.createPhysicalConnection(); holder = new DruidConnectionHolder(this, pyConnInfo); @@ -1493,6 +1497,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat .append(", maxActive ").append(maxActive)// .append(", creating ").append(creatingCount)// ; + if (creatingCount > 0 && createStartNanos > 0) { + long createElapseMillis = (System.nanoTime() - createStartNanos) / (1000 * 1000); + if (createElapseMillis > 0) { + buf.append(", createElapseMillis ").append(createElapseMillis); + } + } List sqlList = this.getDataSourceStat().getRuningSqlList(); for (int i = 0; i < sqlList.size(); ++i) { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/MaxWaitTest.java b/src/test/java/com/alibaba/druid/bvt/pool/MaxWaitTest.java new file mode 100644 index 0000000000..473ef5a422 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/pool/MaxWaitTest.java @@ -0,0 +1,46 @@ +package com.alibaba.druid.bvt.pool; + +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; + +public class MaxWaitTest extends TestCase { + protected DruidDataSource dataSource; + + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:mock:driver"); + dataSource.setMaxWait(100); + dataSource.setDriver(new MockDriver() { + @Override + public Connection connect(String url, Properties info) throws SQLException { + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // skip + } + return super.connect(url, info); + } + }); + } + + protected void tearDown() throws Exception { + dataSource.close(); + } + + public void test_wait() throws Exception { + Exception error = null; + try { + DruidPooledConnection conn = dataSource.getConnection(); + conn.close(); + } catch (SQLException ex) { + error = ex; + } + assertTrue(error.getMessage().contains("createElapseMillis ")); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/pool/UrlNotSetTest.java b/src/test/java/com/alibaba/druid/bvt/pool/UrlNotSetTest.java new file mode 100644 index 0000000000..9da44877c8 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/pool/UrlNotSetTest.java @@ -0,0 +1,31 @@ +package com.alibaba.druid.bvt.pool; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import junit.framework.TestCase; + +import java.sql.SQLException; + +public class UrlNotSetTest extends TestCase { + protected DruidDataSource dataSource; + + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setMaxWait(10); + } + + protected void tearDown() throws Exception { + dataSource.close(); + } + + public void test_wait() throws Exception { + Exception error = null; + try { + DruidPooledConnection conn = dataSource.getConnection(); + conn.close(); + } catch (SQLException ex) { + error = ex; + } + assertEquals("url not set", error.getMessage()); + } +}