Author: kwall
Date: Mon Apr 23 12:44:37 2012
New Revision: 1329215
URL: http://svn.apache.org/viewvc?rev=1329215&view=rev
Log:
QPID-3936: Change Performance Test Framework to support running of a series of
test definition files and the production of a separate CSV per test definition.
Added:
qpid/trunk/qpid/java/perftests/etc/suite/
qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json
qpid/trunk/qpid/java/perftests/etc/suite/QueueTypes.json
- copied, changed from r1328987,
qpid/trunk/qpid/java/perftests/etc/perftests.json
qpid/trunk/qpid/java/perftests/etc/suite/QueuesWithSelectors.json
qpid/trunk/qpid/java/perftests/etc/suite/VaryingNumberOfParticipants.json
qpid/trunk/qpid/java/perftests/example/PQBT-AA-Qpid-01.json
qpid/trunk/qpid/java/perftests/example/TQBT-TX-Qpid-01.json
Modified:
qpid/trunk/qpid/java/perftests/etc/perftests-jndi.properties
qpid/trunk/qpid/java/perftests/etc/perftests.json
qpid/trunk/qpid/java/perftests/example/run-client.sh
qpid/trunk/qpid/java/perftests/example/run.sh
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantResultFactory.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantAttribute.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/ParticipantResult.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregator.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregator.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantResultFactoryTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/ParticipantResultTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregatorTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/expectedOutput.csv
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
qpid/trunk/qpid/java/test-profiles/CPPExcludes
qpid/trunk/qpid/java/test-profiles/Excludes
Modified: qpid/trunk/qpid/java/perftests/etc/perftests-jndi.properties
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/perftests-jndi.properties?rev=1329215&r1=1329214&r2=1329215&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/perftests-jndi.properties (original)
+++ qpid/trunk/qpid/java/perftests/etc/perftests-jndi.properties Mon Apr 23
12:44:37 2012
@@ -21,6 +21,6 @@
java.naming.factory.initial =
org.apache.qpid.jndi.PropertiesFileInitialContextFactory
# use QpidBrokerTestCase's default port
-connectionfactory.connectionfactory =
amqp://guest:guest@clientid/test?brokerlist='tcp://noc-qpiddev02.ny.jpmorgan.com:35672'
+connectionfactory.connectionfactory =
amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
destination.controllerqueue = direct://amq.direct//controllerqueue
Modified: qpid/trunk/qpid/java/perftests/etc/perftests.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/perftests.json?rev=1329215&r1=1329214&r2=1329215&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/perftests.json (original)
+++ qpid/trunk/qpid/java/perftests/etc/perftests.json Mon Apr 23 12:44:37 2012
@@ -154,7 +154,8 @@
],
"_queues":[
{
- "_name": "direct://amq.direct//testQueue",
+ "_name": "direct://amq.direct//testQueuei?durable='true'",
+ "_durable": true,
"_attributes":
{
"x-qpid-capacity": 10485760,
Added: qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json?rev=1329215&view=auto
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json (added)
+++ qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json Mon Apr 23
12:44:37 2012
@@ -0,0 +1,213 @@
+{
+ "_tests":[
+ {
+ "_name": "Message Size - 1P-1C - NON_PERSISTENT";
+ "_iterations":[
+ {
+ "_messageSize": 256,
+ "_numberOfMessages": 10000000
+ },
+ {
+ "_messageSize": 512,
+ "_numberOfMessages": 5000000
+ },
+ {
+ "_messageSize": 1024,
+ "_numberOfMessages": "2500000"
+ },
+ {
+ "_messageSize": 2048,
+ "_numberOfMessages": "1250000"
+ },
+ {
+ "_messageSize": 4096,
+ "_numberOfMessages": "625000"
+ },
+ {
+ "_messageSize": 8192,
+ "_numberOfMessages": 312500
+ },
+ {
+ "_messageSize": 16384,
+ "_numberOfMessages": 156250
+ },
+ {
+ "_messageSize": 32768,
+ "_numberOfMessages": 78125
+ },
+ {
+ "_messageSize": 65536,
+ "_numberOfMessages": 39062
+ },
+ {
+ "_messageSize": 131072,
+ "_numberOfMessages": 1953
+ },
+ {
+ "_messageSize": 262144,
+ "_numberOfMessages": 9765
+ }
+ ],
+ "_queues":[
+ {
+ "_name": "direct://amq.direct//testQueue",
+ "_attributes":
+ {
+ "x-qpid-capacity": 10485760,
+ "x-qpid-flow-resume-capacity": 8388608
+ }
+ }
+ ],
+ "_clients":[
+ {
+ "_name": "producingClient",
+ "_connections":[
+ {
+ "_name": "connection1",
+ "_factory": "connectionfactory",
+ "_sessions": [
+ {
+ "_sessionName": "session1",
+ "_acknowledgeMode": 1,
+ "_producers": [
+ {
+ "_name": "Producer1",
+ "_destinationName": "direct://amq.direct//testQueue",
+ "_deliveryMode": 1
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "_name": "consumingClient",
+ "_connections":[
+ {
+ "_name": "connection1",
+ "_factory": "connectionfactory",
+ "_sessions": [
+ {
+ "_sessionName": "session1",
+ "_acknowledgeMode": 1,
+ "_consumers": [
+ {
+ "_name": "Consumer1",
+ "_destinationName": "direct://amq.direct//testQueue"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "_name": "Message Size - 1P-1C - PERSISTENT";
+ "_iterations":[
+ {
+ "_messageSize": 256,
+ "_numberOfMessages": 200000
+ },
+ {
+ "_messageSize": 512,
+ "_numberOfMessages": 200000
+ },
+ {
+ "_messageSize": 1024,
+ "_numberOfMessages": 200000
+ },
+ {
+ "_messageSize": 2048,
+ "_numberOfMessages": 200000
+ },
+ {
+ "_messageSize": 4096,
+ "_numberOfMessages": 40000
+ },
+ {
+ "_messageSize": 8192,
+ "_numberOfMessages": 40000
+ },
+ {
+ "_messageSize": 16384,
+ "_numberOfMessages": 40000
+ },
+ {
+ "_messageSize": 32768,
+ "_numberOfMessages": 20000
+ },
+ {
+ "_messageSize": 65536,
+ "_numberOfMessages": 20000
+ },
+ {
+ "_messageSize": 131072,
+ "_numberOfMessages": 20000
+ },
+ {
+ "_messageSize": 262144,
+ "_numberOfMessages": 20000
+ }
+ ],
+ "_queues":[
+ {
+ "_name": "direct://amq.direct//testQueuei?durable='true'",
+ "_durable": true,
+ "_attributes":
+ {
+ "x-qpid-capacity": 10485760,
+ "x-qpid-flow-resume-capacity": 8388608
+ }
+ }
+ ],
+ "_clients":[
+ {
+ "_name": "producingClient",
+ "_connections":[
+ {
+ "_name": "connection1",
+ "_factory": "connectionfactory",
+ "_sessions": [
+ {
+ "_sessionName": "session1",
+ "_acknowledgeMode": 1,
+ "_producers": [
+ {
+ "_name": "Producer1",
+ "_destinationName": "direct://amq.direct//testQueue",
+ "_deliveryMode": 2
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "_name": "consumingClient",
+ "_connections":[
+ {
+ "_name": "connection1",
+ "_factory": "connectionfactory",
+ "_sessions": [
+ {
+ "_sessionName": "session1",
+ "_acknowledgeMode": 1,
+ "_consumers": [
+ {
+ "_name": "Consumer1",
+ "_destinationName": "direct://amq.direct//testQueue"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
