Author: kfujino
Date: Wed Sep 4 09:01:22 2013
New Revision: 1519949
URL: http://svn.apache.org/r1519949
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55343
Add flag to ignore error of connection creation while initializing the pool.
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1519949&r1=1519948&r2=1519949&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Wed Sep 4
09:01:22 2013
@@ -495,6 +495,13 @@
<p>(boolean) Set this to true to propagate the interrupt state for a
thread that has been interrupted (not clearing the interrupt state). Default
value is <code>false</code> for backwards compatibility.
</p>
</attribute>
+ <attribute name="ignoreExceptionOnPreLoad" required="false">
+ <p>(boolean) Flag whether ignore error of connection creation while
initializing the pool.
+ Set to true if you want to ignore error of connection creation while
initializing the pool.
+ Set to false if you want to fail the initialization of the pool by
throwing exception.
+ The default value is <code>false</code>.
+ </p>
+ </attribute>
</attributes>
</subsection>
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1519949&r1=1519948&r2=1519949&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Wed Sep 4 09:01:22 2013
@@ -487,9 +487,12 @@ public class ConnectionPool {
} //for
} catch (SQLException x) {
- if (jmxPool!=null)
jmxPool.notify(org.apache.tomcat.jdbc.pool.jmx.ConnectionPool.NOTIFY_INIT,
getStackTrace(x));
- close(true);
- throw x;
+ log.error("Unable to create initial connections of pool.", x);
+ if (!poolProperties.isIgnoreExceptionOnPreLoad()) {
+ if (jmxPool!=null)
jmxPool.notify(org.apache.tomcat.jdbc.pool.jmx.ConnectionPool.NOTIFY_INIT,
getStackTrace(x));
+ close(true);
+ throw x;
+ }
} finally {
//return the members as idle to the pool
for (int i = 0; i < initialPool.length; i++) {
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1519949&r1=1519948&r2=1519949&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Wed Sep 4 09:01:22 2013
@@ -122,6 +122,8 @@ public class DataSourceFactory implement
protected static final String PROP_PROPAGATEINTERRUPTSTATE =
"propagateInterruptState";
+ protected static final String PROP_IGNOREEXCEPTIONONPRELOAD =
"ignoreExceptionOnPreLoad";
+
public static final int UNKNOWN_TRANSACTIONISOLATION = -1;
public static final String OBJECT_NAME = "object_name";
@@ -175,7 +177,8 @@ public class DataSourceFactory implement
PROP_ROLLBACKONRETURN,
PROP_USEDISPOSABLECONNECTIONFACADE,
PROP_LOGVALIDATIONERRORS,
- PROP_PROPAGATEINTERRUPTSTATE
+ PROP_PROPAGATEINTERRUPTSTATE,
+ PROP_IGNOREEXCEPTIONONPRELOAD
};
// -------------------------------------------------- ObjectFactory Methods
@@ -514,6 +517,11 @@ public class DataSourceFactory implement
poolProperties.setPropagateInterruptState(Boolean.parseBoolean(value));
}
+ value = properties.getProperty(PROP_IGNOREEXCEPTIONONPRELOAD);
+ if (value != null) {
+
poolProperties.setIgnoreExceptionOnPreLoad(Boolean.parseBoolean(value));
+ }
+
return poolProperties;
}
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1519949&r1=1519948&r2=1519949&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Wed Sep 4 09:01:22 2013
@@ -1288,6 +1288,22 @@ public class DataSourceProxy implements
getPoolProperties().setPropagateInterruptState(propagateInterruptState);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isIgnoreExceptionOnPreLoad() {
+ return getPoolProperties().isIgnoreExceptionOnPreLoad();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setIgnoreExceptionOnPreLoad(boolean ignoreExceptionOnPreLoad) {
+
getPoolProperties().setIgnoreExceptionOnPreLoad(ignoreExceptionOnPreLoad);
+ }
+
public void purge() {
try {
createPool().purge();
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1519949&r1=1519948&r2=1519949&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
Wed Sep 4 09:01:22 2013
@@ -864,4 +864,16 @@ public interface PoolConfiguration {
*/
public void setPropagateInterruptState(boolean propagateInterruptState);
+ /**
+ * Set to true if you want to ignore error of connection creation while
initializing the pool.
+ * Set to false if you want to fail the initialization of the pool by
throwing exception.
+ * @param ignoreExceptionOnPreLoad set to true if you want to ignore error
of connection creation while initializing the pool.
+ */
+ public void setIgnoreExceptionOnPreLoad(boolean ignoreExceptionOnPreLoad);
+
+ /**
+ * @see PoolConfiguration#setIgnoreExceptionOnPreLoad(boolean)
+ */
+ public boolean isIgnoreExceptionOnPreLoad();
+
}
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1519949&r1=1519948&r2=1519949&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Wed Sep 4 09:01:22 2013
@@ -92,6 +92,7 @@ public class PoolProperties implements P
private volatile boolean useDisposableConnectionFacade = true;
private volatile boolean logValidationErrors = false;
private volatile boolean propagateInterruptState = false;
+ private volatile boolean ignoreExceptionOnPreLoad = false;
/**
@@ -1256,6 +1257,22 @@ public class PoolProperties implements P
this.propagateInterruptState = propagateInterruptState;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isIgnoreExceptionOnPreLoad() {
+ return ignoreExceptionOnPreLoad;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setIgnoreExceptionOnPreLoad(boolean ignoreExceptionOnPreLoad) {
+ this.ignoreExceptionOnPreLoad = ignoreExceptionOnPreLoad;
+ }
+
@Override
protected Object clone() throws CloneNotSupportedException {
// TODO Auto-generated method stub
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1519949&r1=1519948&r2=1519949&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Wed Sep 4 09:01:22 2013
@@ -832,6 +832,22 @@ public class ConnectionPool extends Noti
* {@inheritDoc}
*/
@Override
+ public boolean isIgnoreExceptionOnPreLoad() {
+ return getPoolProperties().isIgnoreExceptionOnPreLoad();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setIgnoreExceptionOnPreLoad(boolean ignoreExceptionOnPreLoad) {
+
getPoolProperties().setIgnoreExceptionOnPreLoad(ignoreExceptionOnPreLoad);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public void purge() {
pool.purge();
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1519949&r1=1519948&r2=1519949&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 4 09:01:22 2013
@@ -330,6 +330,10 @@
<code>InterruptedException</code> is thrown, the interrupted flag has
been cleared. (kfujino)
</fix>
+ <fix>
+ <bug>55343</bug>: Add flag to ignore exceptions of connection creation
+ while initializing the pool. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
