[prev in list] [next in list] [prev in thread] [next in thread]
List: rhq-commits
Subject: [rhq] Branch 'release-3.0.0' - modules/enterprise modules/plugins
From: pilhuhn () fedoraproject ! org (Heiko W ! Rupp)
Date: 2010-06-30 13:48:54
Message-ID: 20100630134854.CB82E120267 () lists ! fedorahosted ! org
[Download RAW message or body]
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java \
| 10 ++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java \
| 20 ++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java \
| 8 ++ modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml \
| 33 +++++----- 4 files changed, 56 insertions(+), 15 deletions(-)
New commits:
commit f9d920d56d03b7a0185224e155dd30a10f5b5538
Author: Heiko W. Rupp <hwr at redhat.com>
Date: Wed Jun 30 14:28:15 2010 +0200
Monitor call time values separately.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java
index 253765d..08f3418 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java
@@ -125,12 +125,15 @@ public class CallTimeDataManagerBean implements \
CallTimeDataManagerLocal, CallTi }
log.debug("Persisting call-time data for " + callTimeDataSet.size() + " \
schedules..."); + long startTime = System.currentTimeMillis();
// First make sure a single row exists in the key table for each reported \
call destination. callTimeDataManager.insertCallTimeDataKeys(callTimeDataSet);
// Finally, add the stats themselves to the value table.
callTimeDataManager.insertCallTimeDataValues(callTimeDataSet);
+ MeasurementMonitor.getMBean().incrementCallTimeInsertTime(System.currentTimeMillis() \
- startTime); +
}
@SuppressWarnings("unchecked")
@@ -408,7 +411,12 @@ public class CallTimeDataManagerBean implements \
CallTimeDataManagerLocal, CallTi
notifyAlertConditionCacheManager("insertCallTimeDataValues", \
callTimeDataSet
.toArray(new CallTimeData[callTimeDataSet.size()]));
- log.debug("Inserted " + ((insertedRowCount >= 0) ? insertedRowCount : \
"?") + " call-time data value rows."); + if (insertedRowCount>0) {
+ MeasurementMonitor.getMBean().incrementCalltimeValuesInserted(insertedRowCount);
+
+ log.debug("Inserted " + insertedRowCount + " call-time data value \
rows."); + }
+
} catch (SQLException e) {
logSQLException("Failed to persist call-time data values", e);
} catch (Throwable t) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java
index 9ad1f24..3ff3a17 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java
@@ -35,6 +35,10 @@ public class MeasurementMonitor implements \
MeasurementMonitorMBean, MBeanRegistr
private AtomicLong measurementsInserted = new AtomicLong();
+ private AtomicLong callTimeInsertTime = new AtomicLong();
+
+ private AtomicLong calltimeValuesInserted = new AtomicLong();
+
private AtomicLong availabilityInsertTime = new AtomicLong();
private AtomicLong availabilitiesInserted = new AtomicLong();
@@ -101,6 +105,22 @@ public class MeasurementMonitor implements \
MeasurementMonitorMBean, MBeanRegistr this.measurementsInserted.addAndGet(delta);
}
+ public long getCalltimeValuesInserted() {
+ return calltimeValuesInserted.get();
+ }
+
+ public void incrementCalltimeValuesInserted(long delta) {
+ this.calltimeValuesInserted.addAndGet(delta);
+ }
+
+ public long getCallTimeInsertTime() {
+ return callTimeInsertTime.get();
+ }
+
+ public void incrementCallTimeInsertTime(long delta) {
+ this.callTimeInsertTime.addAndGet(delta);
+ }
+
public long getAvailabilityInsertTime() {
return availabilityInsertTime.get();
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java
index 04fc6cd..df7b05c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java
@@ -31,6 +31,14 @@ public interface MeasurementMonitorMBean {
void incrementMeasurementsInserted(long delta);
+ long getCallTimeInsertTime();
+
+ void incrementCallTimeInsertTime(long delta);
+
+ long getCalltimeValuesInserted();
+
+ void incrementCalltimeValuesInserted(long delta);
+
int getScheduledMeasurementsPerMinute();
long getPurgeTime();
diff --git a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml \
b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml index \
94db789..2ad0785 100644
--- a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
@@ -23,7 +23,7 @@
<c:simple-property name="nameTemplate" default="Alert Subsystem"/>
<c:simple-property name="descriptionTemplate" default="Statistics for the \
RHQ Server Alerts Engine Subsystem."/> </plugin-configuration>
-
+
<operation name="reloadCaches" description="Unloads then reloads all caches \
managed by the containing RHQ Server"> <results>
<c:list-property name="reloadStatistics">
@@ -75,7 +75,7 @@
description="The total amount of time spent by the alerts cache \
processing resource configuration data"/>
<metric property="OperationProcessingTime" units="milliseconds" \
displayType="summary" measurementType="trendsup"
description="The total amount of time spent by the alerts cache \
processing operation history data"/>
-
+
</service>
<service name="RHQ Server Measurement Subsystem"
@@ -94,8 +94,13 @@
<c:simple-property name="descriptionTemplate" default="Statistics for the \
RHQ Server Measurement Subsystem."/> </plugin-configuration>
+ <metric property="CalltimeValuesInserted" category="throughput" \
displayType="summary" measurementType="trendsup" + description="The \
total number of call time data records inserted into the database by this RHQ Server \
instance since it was started"/> + <metric property="CallTimeInsertTime" \
units="milliseconds" displayType="summary" measurementType="trendsup" + \
description="The total amount of time taken to insert call time data into the \
database by this RHQ Server instance since it was started"/> +
<metric property="MeasurementsInserted" category="throughput" \
displayType="summary" measurementType="trendsup"
- description="The total number of measurement records inserted into the \
database by this RHQ Server instance since it was started"/> + \
description="The total number of measurement records (incl. Calltime data) inserted \
into the database by this RHQ Server instance since it was started"/> <metric \
property="ScheduledMeasurementsPerMinute"
description="The average number of measurements expected to be \
collected per minute"/>
<metric property="MeasurementInsertTime" units="milliseconds" \
displayType="summary" measurementType="trendsup" @@ -118,23 +123,23 @@
<metric property="FullAvailabilityReports" displayType="summary" \
measurementType="trendsup"
description="The number of full availability reports received and \
processed by this RHQ Server since it was started"/>
- <metric property="PurgedAlerts" displayType="summary" \
measurementType="dynamic" category="utilization" defaultInterval="900000" + \
<metric property="PurgedAlerts" displayType="summary" measurementType="dynamic" \
category="utilization" defaultInterval="900000"
description="Number of alerts purged by the last purge job"/>
- <metric property="PurgedAlertConditions" displayType="summary" \
measurementType="dynamic" category="utilization" defaultInterval="900000" + \
<metric property="PurgedAlertConditions" displayType="summary" \
measurementType="dynamic" category="utilization" \
defaultInterval="900000"
description="Number of alert conditions purged by the last purge \
job"/>
- <metric property="PurgedAlertNotifications" displayType="summary" \
measurementType="dynamic" category="utilization" defaultInterval="900000" + \
<metric property="PurgedAlertNotifications" displayType="summary" \
measurementType="dynamic" category="utilization" \
defaultInterval="900000"
description="Number of alert notifications purged by the last purge \
job"/>
- <metric property="PurgedAvailabilities" displayType="summary" \
measurementType="dynamic" category="utilization" defaultInterval="900000" + \
<metric property="PurgedAvailabilities" displayType="summary" \
measurementType="dynamic" category="utilization" \
defaultInterval="900000"
description="Number of availabilities purged by the last purge job"/>
- <metric property="PurgedCallTimeData" displayType="summary" \
measurementType="dynamic" category="utilization" defaultInterval="900000" + \
<metric property="PurgedCallTimeData" displayType="summary" measurementType="dynamic" \
category="utilization" defaultInterval="900000"
description="Number of call time data purged by the last purge job"/>
- <metric property="PurgedEvents" displayType="summary" \
measurementType="dynamic" category="utilization" defaultInterval="900000" + \
<metric property="PurgedEvents" displayType="summary" measurementType="dynamic" \
category="utilization" defaultInterval="900000"
description="Number of events purged by the last purge job"/>
- <metric property="PurgedMeasurementTraits" displayType="summary" \
measurementType="dynamic" category="utilization" defaultInterval="900000" + \
<metric property="PurgedMeasurementTraits" displayType="summary" \
measurementType="dynamic" category="utilization" \
defaultInterval="900000"
description="Number of traits purged by the last purge job"/>
-
+
</service>
-
+
<service name="RHQ Server Group Definition / DynaGroups Subsystem"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
class="GroupDefinitionResourceComponent"
@@ -144,13 +149,13 @@
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
</runs-inside>
-
+
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true" \
default="rhq:service=GroupDefinitionRecalculationThreadMonitor"/>
<c:simple-property name="nameTemplate" default="Group Definition \
Subsystem"/>
<c:simple-property name="descriptionTemplate" default="Statistics for the \
RHQ Server Group Definition / DynaGroups Subsystem."/> </plugin-configuration>
-
+
<operation name="clear" displayName="Clear Statistics" description="Clear the \
collected statistics, and start collecting anew"/>
<operation name="retrieveStatistics" description="View a snapshot of \
statistical information about the recalculation cost of each GroupDefinition in the \
system">
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic