Author: kfujino
Date: Wed Jan 31 05:47:37 2018
New Revision: 1822754
URL: http://svn.apache.org/viewvc?rev=1822754&view=rev
Log:
Add MBean for PooledConnection.
Added:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnectionMBean.java
(with props)
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1822754&r1=1822753&r2=1822754&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Wed Jan 31 05:47:37 2018
@@ -295,6 +295,7 @@ public class ConnectionPool {
//fetch previously cached interceptor proxy - one per connection
JdbcInterceptor handler = con.getHandler();
if (handler==null) {
+ if (jmxPool != null) con.createMBean();
//build the proxy handler
handler = new
ProxyConnection(this,con,getPoolProperties().isUseEquals());
//set up the interceptor chain
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1822754&r1=1822753&r2=1822754&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Wed Jan 31 05:47:37 2018
@@ -23,18 +23,22 @@ import java.sql.Statement;
import java.util.HashMap;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import javax.management.ObjectName;
+
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
+import org.apache.tomcat.jdbc.pool.jmx.JmxUtil;
/**
* Represents a pooled connection
* and holds a reference to the {@link java.sql.Connection} object
* @version 1.0
*/
-public class PooledConnection {
+public class PooledConnection implements PooledConnectionMBean {
/**
* Logger
*/
@@ -106,6 +110,10 @@ public class PooledConnection {
private volatile long connectionVersion=0;
+ private static final AtomicLong connectionIndex = new AtomicLong(0);
+
+ private ObjectName oname = null;
+
/**
* Weak reference to cache the list of interceptors for this connection
* so that we don't create a new list of interceptors each time we borrow
@@ -130,6 +138,7 @@ public class PooledConnection {
connectionVersion = parent.getPoolVersion();
}
+ @Override
public long getConnectionVersion() {
return connectionVersion;
}
@@ -334,6 +343,7 @@ public class PooledConnection {
*
* @return true if connect() was called successfully and disconnect has
not yet been called
*/
+ @Override
public boolean isInitialized() {
return connection!=null;
}
@@ -344,6 +354,7 @@ public class PooledConnection {
* @return Returns true if the connection has been connected more than
* {@link PoolConfiguration#getMaxAge()} milliseconds. false otherwise.
*/
+ @Override
public boolean isMaxAgeExpired() {
if (getPoolProperties().getMaxAge()>0 ) {
return (System.currentTimeMillis() - getLastConnected()) >
getPoolProperties().getMaxAge();
@@ -586,6 +597,10 @@ public class PooledConnection {
log.debug("Unable to close SQL connection",x);
}
}
+ if (oname != null) {
+ JmxUtil.unregisterJmx(oname);
+ oname = null;
+ }
return released.compareAndSet(false, true);
}
@@ -618,7 +633,7 @@ public class PooledConnection {
setSuspect(false);
}
-
+ @Override
public boolean isSuspect() {
return suspect;
}
@@ -661,6 +676,7 @@ public class PooledConnection {
* This timestamp can also be reset by the {@link
org.apache.tomcat.jdbc.pool.interceptor.ResetAbandonedTimer#invoke(Object,
java.lang.reflect.Method, Object[])}
* @return the timestamp of the last pool action as defined by {@link
System#currentTimeMillis()}
*/
+ @Override
public long getTimestamp() {
return timestamp;
}
@@ -670,6 +686,7 @@ public class PooledConnection {
* @return the discarded flag. If the value is true,
* either {@link #disconnect(boolean)} has been called or it will be
called when the connection is returned to the pool.
*/
+ @Override
public boolean isDiscarded() {
return discarded;
}
@@ -678,6 +695,7 @@ public class PooledConnection {
* Returns the timestamp of the last successful validation query execution.
* @return the timestamp of the last successful validation query execution
as defined by {@link System#currentTimeMillis()}
*/
+ @Override
public long getLastValidated() {
return lastValidated;
}
@@ -737,6 +755,7 @@ public class PooledConnection {
* ie, a successful call to {@link java.sql.Driver#connect(String,
java.util.Properties)}.
* @return the timestamp when this connection was created as defined by
{@link System#currentTimeMillis()}
*/
+ @Override
public long getLastConnected() {
return lastConnected;
}
@@ -769,6 +788,7 @@ public class PooledConnection {
* Returns true if this connection has been released and wont be reused.
* @return true if the method {@link #release()} has been called
*/
+ @Override
public boolean isReleased() {
return released.get();
}
@@ -777,4 +797,48 @@ public class PooledConnection {
return attributes;
}
+ public void createMBean() {
+ if (oname != null) return;
+ String keyprop =
",connections=PooledConnection["+connectionIndex.getAndIncrement()+"]";
+ oname = JmxUtil.registerJmx(parent.getJmxPool().getObjectName(),
keyprop, this);
+ }
+
+ public ObjectName getObjectName() {
+ return oname;
+ }
+
+ @Override
+ public boolean isClosed() throws SQLException {
+ return connection.isClosed();
+ }
+
+ @Override
+ public boolean getAutoCommit() throws SQLException {
+ return connection.getAutoCommit();
+ }
+
+ @Override
+ public String getCatalog() throws SQLException {
+ return connection.getCatalog();
+ }
+
+ @Override
+ public int getHoldability() throws SQLException {
+ return connection.getHoldability();
+ }
+
+ @Override
+ public boolean isReadOnly() throws SQLException {
+ return connection.isReadOnly();
+ }
+
+ @Override
+ public String getSchema() throws SQLException {
+ return connection.getSchema();
+ }
+
+ @Override
+ public int getTransactionIsolation() throws SQLException {
+ return connection.getTransactionIsolation();
+ }
}
Added:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnectionMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnectionMBean.java?rev=1822754&view=auto
==============================================================================
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnectionMBean.java
(added)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnectionMBean.java
Wed Jan 31 05:47:37 2018
@@ -0,0 +1,25 @@
+package org.apache.tomcat.jdbc.pool;
+
+import java.sql.SQLException;
+
+public interface PooledConnectionMBean {
+ // PooledConnection
+ public long getConnectionVersion();
+ public boolean isInitialized();
+ public boolean isMaxAgeExpired();
+ public boolean isSuspect();
+ public long getTimestamp();
+ public boolean isDiscarded();
+ public long getLastValidated();
+ public long getLastConnected();
+ public boolean isReleased();
+
+ // java.sql.Connection
+ public boolean isClosed() throws SQLException;
+ public boolean getAutoCommit() throws SQLException;
+ public String getCatalog() throws SQLException;
+ public int getHoldability() throws SQLException;
+ public boolean isReadOnly() throws SQLException;
+ public String getSchema() throws SQLException;
+ public int getTransactionIsolation() throws SQLException;
+}
Propchange:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnectionMBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1822754&r1=1822753&r2=1822754&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Jan 31 05:47:37 2018
@@ -100,6 +100,9 @@
<code>PooledConnection</code> and <code>JdbcInterceptors</code>.
(kfujino)
</add>
+ <add>
+ Add MBean for <code>PooledConnection</code>. (kfujino)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
