Author: kfujino
Date: Tue Jan 10 07:28:57 2017
New Revision: 1778092
URL: http://svn.apache.org/viewvc?rev=1778092&view=rev
Log:
Enable reset the statistics without restarting the pool.
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1778092&r1=1778091&r2=1778092&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Jan 10 07:28:57 2017
@@ -1240,6 +1240,19 @@ public class ConnectionPool {
}
/**
+ * reset the statistics of this pool.
+ */
+ public void resetStats() {
+ borrowedCount.set(0);
+ returnedCount.set(0);
+ createdCount.set(0);
+ releasedCount.set(0);
+ reconnectedCount.set(0);
+ removeAbandonedCount.set(0);
+ releasedIdleCount.set(0);
+ }
+
+ /**
* Tread safe wrapper around a future for the regular queue
* This one retrieves the pooled connection object
* and performs the initialization according to
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1778092&r1=1778091&r2=1778092&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Jan 10 07:28:57 2017
@@ -798,6 +798,7 @@ public class DataSourceProxy implements
throw new RuntimeException(x);
}
}
+
/**
* The total number of connections reconnected by this pool.
* @return the reconnected connection count
@@ -809,6 +810,18 @@ public class DataSourceProxy implements
throw new RuntimeException(x);
}
}
+
+ /**
+ * reset the statistics of this pool.
+ */
+ public void resetStats() {
+ try {
+ createPool().resetStats();
+ } catch (SQLException x) {
+ throw new RuntimeException(x);
+ }
+ }
+
//=========================================================
// PROPERTIES / CONFIGURATION
//=========================================================
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1778092&r1=1778091&r2=1778092&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Tue Jan 10 07:28:57 2017
@@ -218,6 +218,12 @@ public class ConnectionPool extends Noti
public void testIdle() {
pool.testAllIdle();
}
+
+ @Override
+ public void resetStats() {
+ pool.resetStats();
+ }
+
//=================================================================
// POOL PROPERTIES
//=================================================================
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java?rev=1778092&r1=1778091&r2=1778092&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
Tue Jan 10 07:28:57 2017
@@ -74,6 +74,11 @@ public interface ConnectionPoolMBean ext
*/
public void purgeOnReturn();
+ /**
+ * reset the statistics of this pool.
+ */
+ public void resetStats();
+
//=================================================================
// POOL NOTIFICATIONS
//=================================================================
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml?rev=1778092&r1=1778091&r2=1778092&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
Tue Jan 10 07:28:57 2017
@@ -390,6 +390,11 @@
impact="ACTION"
returnType="void" />
+ <operation name="resetStats"
+ description="reset the statistics of this pool."
+ impact="ACTION"
+ returnType="void" />
+
</mbean>
</mbeans-descriptors>
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1778092&r1=1778091&r2=1778092&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jan 10 07:28:57 2017
@@ -236,6 +236,9 @@
<bug>60398</bug>: Fix testcase of <code>TestSlowQueryReport</code>.
(kfujino)
</fix>
+ <add>
+ Enable reset the statistics without restarting the pool. (kfujino)
+ </add>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
