Author: kfujino
Date: Mon Sep 12 08:16:06 2016
New Revision: 1760306
URL: http://svn.apache.org/viewvc?rev=1760306&view=rev
Log:
Notify jmx when returning the connection that has been marked suspect.
Modified:
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/jmx/ConnectionPool.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
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=1760306&r1=1760305&r2=1760306&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
Mon Sep 12 08:16:06 2016
@@ -896,6 +896,10 @@ public class ConnectionPool {
log.info("Connection(" + con + ") that has been marked
suspect was returned."
+ " The processing time is " +
(System.currentTimeMillis()-con.getTimestamp()) + " ms.");
}
+ if (jmxPool!=null) {
+
jmxPool.notify(org.apache.tomcat.jdbc.pool.jmx.ConnectionPool.SUSPECT_RETURNED_NOTIFICATION,
+ "Connection(" + con + ") that has been marked
suspect was returned.");
+ }
}
if (busy.remove(con)) {
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=1760306&r1=1760305&r2=1760306&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
Mon Sep 12 08:16:06 2016
@@ -76,6 +76,7 @@ public class ConnectionPool extends Noti
public static final String FAILED_QUERY_NOTIFICATION = "FAILED QUERY";
public static final String SUSPECT_ABANDONED_NOTIFICATION = "SUSPECT
CONNETION ABANDONED";
public static final String POOL_EMPTY = "POOL EMPTY";
+ public static final String SUSPECT_RETURNED_NOTIFICATION = "SUSPECT
CONNETION RETURNED";
@Override
public MBeanNotificationInfo[] getNotificationInfo() {
@@ -88,7 +89,8 @@ public class ConnectionPool extends Noti
}
public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
- String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT,
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION, FAILED_QUERY_NOTIFICATION,
SUSPECT_ABANDONED_NOTIFICATION};
+ String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT,
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION,
+ FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION,
SUSPECT_RETURNED_NOTIFICATION};
String name = Notification.class.getName();
String description = "A connection pool error condition was met.";
MBeanNotificationInfo info = new MBeanNotificationInfo(types, name,
description);
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=1760306&r1=1760305&r2=1760306&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 12 08:16:06 2016
@@ -58,6 +58,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.72 (violetagg)">
+ <subsection name="jdbc-pool">
+ <changelog>
+ <fix>
+ Notify jmx when returning the connection that has been marked suspect.
+ (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.71 (violetagg)">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
