modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java
| 52 +++++-----
modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml
| 6 -
modules/plugins/perftest/src/main/resources/configurable-5.xml
| 4
3 files changed, 32 insertions(+), 30 deletions(-)
New commits:
commit 2bbb4cf551c52288216a1d6ad3e1a43d44c320e3
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Dec 17 15:30:53 2010 +0100
Replace batching by individual statements. Related to BZ 658491
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 df8fbd2..2c76232 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
@@ -316,25 +316,26 @@ public class CallTimeDataManagerBean implements
CallTimeDataManagerLocal, CallTi
for (String callDestination : callDestinations) {
ps.setString(2, callDestination);
ps.setString(4, callDestination);
- ps.addBatch();
+// ps.addBatch();
+ ps.execute();
}
}
- results = ps.executeBatch();
+// results = ps.executeBatch();
int insertedRowCount = 0;
- for (int i = 0; i < results.length; i++) {
- if (((results[i] < 0) || (results[i] > 1)) && (results[i]
!= -2)) // oracle returns -2 because it can't count updated rows
- {
- throw new MeasurementStorageException("Failed to insert
call-time data key rows - result ["
- + results[i] + "] for batch command [" + i + "] is
less than 0 or greater than 1.");
- }
-
- insertedRowCount += results[i]==-2 ? 1 : results[i] ; // If Oracle
returns -2, just count 1 row
- }
-
- log.debug("Inserted new call-time data key rows for " +
((insertedRowCount >= 0) ? insertedRowCount : "?")
- + " out of " + results.length + " reported key-value
pairs.");
+// for (int i = 0; i < results.length; i++) {
+// if (((results[i] < 0) || (results[i] > 1)) && (results[i]
!= -2)) // oracle returns -2 because it can't count updated rows
+// {
+// throw new MeasurementStorageException("Failed to insert
call-time data key rows - result ["
+// + results[i] + "] for batch command [" + i + "]
is less than 0 or greater than 1.");
+// }
+//
+// insertedRowCount += results[i]==-2 ? 1 : results[i] ; // If Oracle
returns -2, just count 1 row
+// }
+
+// log.debug("Inserted new call-time data key rows for " +
((insertedRowCount >= 0) ? insertedRowCount : "?")
+// + " out of " + results.length + " reported key-value
pairs.");
} catch (SQLException e) {
logSQLException("Failed to persist call-time data keys", e);
} catch (Throwable t) {
@@ -392,22 +393,23 @@ public class CallTimeDataManagerBean implements
CallTimeDataManagerLocal, CallTi
ps.setDouble(5, callTimeDataValue.getTotal());
ps.setLong(6, callTimeDataValue.getCount());
ps.setString(8, callDestination);
- ps.addBatch();
+// ps.addBatch();
+ ps.execute();
}
}
- results = ps.executeBatch();
+// results = ps.executeBatch();
int insertedRowCount = 0;
- for (int i = 0; i < results.length; i++) {
- if ((results[i] != 1) && (results[i] != -2)) // Oracle likes to
return -2 becuase it doesn't track batch update counts
- {
- throw new MeasurementStorageException("Failed to insert
call-time data value rows - result ["
- + results[i] + "] for batch command [" + i + "]
does not equal 1.");
- }
-
- insertedRowCount += results[i]==-2 ? 1 : results[i] ; // If Oracle
returns -2, just count 1 row;
- }
+// for (int i = 0; i < results.length; i++) {
+// if ((results[i] != 1) && (results[i] != -2)) // Oracle likes to
return -2 becuase it doesn't track batch update counts
+// {
+// throw new MeasurementStorageException("Failed to insert
call-time data value rows - result ["
+// + results[i] + "] for batch command [" + i + "]
does not equal 1.");
+// }
+//
+// insertedRowCount += results[i]==-2 ? 1 : results[i] ; // If Oracle
returns -2, just count 1 row;
+// }
notifyAlertConditionCacheManager("insertCallTimeDataValues",
callTimeDataSet
.toArray(new CallTimeData[callTimeDataSet.size()]));
commit a3ff39c9c4a1a1e751ce951723d3d04192ab5d21
Merge: b5a1378... aa14f1b...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Dec 17 13:57:01 2010 +0100
Merge branch 'master' of
ssh://git.fedorahosted.org/git/rhq/rhq
commit b5a137896221a3f6980d31ed35fe9d09ffbd21f1
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Dec 17 13:44:26 2010 +0100
Provide less aggressive settings.
diff --git a/modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml
index df3cdbc..2975ccd 100644
--- a/modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml
@@ -314,9 +314,9 @@
<metric property="metric002" defaultOn="true"
displayType="summary" defaultInterval="720000"/>
<metric property="metric003" defaultOn="true"
displayType="summary" defaultInterval="600000"/>
<metric property="metric004" defaultOn="true"
displayType="summary" defaultInterval="600000"/>
- <metric property="trait001" defaultOn="true"
dataType="trait" displayType="summary"
defaultInterval="1200000"/>
- <metric property="trait002" defaultOn="true"
dataType="trait" displayType="summary"
defaultInterval="1440000"/>
- <metric displayName="CallTime" property="calltime"
defaultOn="true" dataType="calltime"
defaultInterval="1200000" units="milliseconds"/>
+ <metric property="trait001" defaultOn="true"
dataType="trait" displayType="summary"
defaultInterval="3600000"/>
+ <metric property="trait002" defaultOn="true"
dataType="trait" displayType="summary"
defaultInterval="2400000"/>
+ <metric displayName="CallTime" property="calltime"
defaultOn="true" dataType="calltime"
defaultInterval="2400000" units="milliseconds"/>
<event name="PerfTestEventType" description="a test event
type"/>
</service>
</server>
diff --git a/modules/plugins/perftest/src/main/resources/configurable-5.xml
b/modules/plugins/perftest/src/main/resources/configurable-5.xml
index c3f68b4..889b2b2 100644
--- a/modules/plugins/perftest/src/main/resources/configurable-5.xml
+++ b/modules/plugins/perftest/src/main/resources/configurable-5.xml
@@ -23,9 +23,9 @@
<simpleNumericMeasurementGenerator/>
<simpleTraitMeasurementGenerator/>
<ConfigurableCallTimeDataGenerator
- minMsgCount="1" maxMsgCount="500"
+ minMsgCount="1" maxMsgCount="100"
minDuration="10" maxDuration="500"
- numberSubPaths="100"/>
+ numberSubPaths="10"/>
</resource>
</scenario>