Updated the performance tests to ensure we use all the available test, added additional comments in pom.xml about each test section.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@672300 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 34 insertions, 3 deletions

diff --git a/java/perftests/RunningPerformanceTests.txt b/java/perftests/RunningPerformanceTests.txt
index 54291483bf..2bc9220774 100644
--- a/java/perftests/RunningPerformanceTests.txt
+++ b/java/perftests/RunningPerformanceTests.txt
@@ -7,7 +7,7 @@ Building the Tests (Only develoeprs need to know how to do this).
 The performance tests are compiled as part of the Maven build by default, but the performance test scripts are not. There is also an additional step to perform, that generates a convenient Jar file containing all of the test dependencies, to simplify invoking Java with a very long command line. The steps to build the performance test suite are:
 
    1. Cd to the /java/perftests directory.
-   2. Execute: mvn uk.co.thebadgerset:junit-toolkit-maven-plugin:tkscriptgen (this generates the scripts).
+   2. Execute: mvn org.apache.qpid:junit-toolkit-maven-plugin:tkscriptgen (this generates the scripts).
    3. Execute: mvn assembly:assembly
 
 The assembly:assembly step generates a Jar with all the dependecies in it in a file name ending with -all-test-deps.jar, which contains the client code and all its dependencies, plus JUnit and the toolkit test runners. The generated scripts expect to find the jar in the current directory. You can Cd to the /target directory and run the scripts from there. The assembly:assembly step also outputs some archives that contain all the scripts and required Jar for convenient shipping of the test suite. Unpack this anywhere you like and run the tests from there.
diff --git a/java/perftests/etc/scripts/MessageSize.sh b/java/perftests/etc/scripts/MessageSize.sh
new file mode 100644
index 0000000000..bb10822257
--- /dev/null
+++ b/java/perftests/etc/scripts/MessageSize.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+find . -regex '.*M-Qpid-.*\.sh' -exec {} -o results-messageSize/ --csv $* \;
diff --git a/java/perftests/etc/scripts/Reliability.sh b/java/perftests/etc/scripts/Reliability.sh
index 6a3c26efba..aa192743ed 100755
--- a/java/perftests/etc/scripts/Reliability.sh
+++ b/java/perftests/etc/scripts/Reliability.sh
@@ -17,4 +17,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-find . -regex '.*R-Qpid-0[1-2].*\.sh' -exec  {} -o results-Reliability/ --csv \; && for i in `seq 1 6` ; do find . -regex '.*R-Qpid-0[3-7].*\.sh' -exec  {} -o results-Reliability/ --csv  \; ; done
+find . -regex '.*R-Qpid-0[1-2].*\.sh' -exec  {} -o results-Reliability/ --csv \; && for i in `seq 1 6` ; do find . -regex '.*R-Qpid-0[3-8].*\.sh' -exec  {} -o results-Reliability/ --csv  \; ; done
diff --git a/java/perftests/etc/scripts/Throughput.sh b/java/perftests/etc/scripts/Throughput.sh
index f8b79f0c65..d08ad248a5 100755
--- a/java/perftests/etc/scripts/Throughput.sh
+++ b/java/perftests/etc/scripts/Throughput.sh
@@ -17,4 +17,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
- find . -regex '.*T.BT-.*\.sh' -exec  {} -o 2110rc3-throughput/ --csv $* \; 
+find . -regex '.*[P|T].BT-.*\.sh' -exec  {} -o results-throughput/ --csv $* \; 
diff --git a/java/perftests/pom.xml b/java/perftests/pom.xml
index 5a6f91c0fd..44af699d99 100644
--- a/java/perftests/pom.xml
+++ b/java/perftests/pom.xml
@@ -243,14 +243,18 @@
                         <!-- Performance Tests. -->
 
                         <!-- Transient, P2P Tests -->
+                        <!-- Concurrency Tests : What are the effects of increasing consumers from 1...30 consumers -->
                         <TQCT-Qpid-01>-n TQCT-Qpid-01         -d1M  -s[1000]   -c[1:30]:samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TQCT-Qpid-01>
                         <TQCT-Qpid-02>-n TQCT-Qpid-02         -d1M  -s[1000]   -c[1:30]:samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TQCT-Qpid-02>
+                        <!-- Latency Tests : What are the effects on latency of increasing consumers from 1...30 consumers -->
                         <TQCL-Qpid-01>-n TQCL-Qpid-01         -d1M  -s[1000]   -c[1:30]:samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TQCL-Qpid-01>
                         <TQCL-Qpid-02>-n TQCL-Qpid-02         -d1M  -s[1000]   -c[1:30]:samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TQCL-Qpid-02>
 
                         <!-- <TQC-Qpid-05>-n TQC-Qpid-05           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TQC-Qpid-05> -->
                         <!-- <TQC-Qpid-06>-n TQC-Qpid-06           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TQC-Qpid-06> -->
 
+
+                        <!-- Message Size Tests : Tests sending message from 512b upto 1M with Point to Point messaging -->
                         <TQM-Qpid-01-512b>-n TQM-Qpid-01-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-01-512b>
                         <TQM-Qpid-02-512b>-n TQM-Qpid-02-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-02-512b>
                         <TQM-Qpid-01-1K>-n TQM-Qpid-01-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-01-1K>
@@ -269,14 +273,17 @@
                         <TQM-Qpid-02-1M>-n TQM-Qpid-02-1M     -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=100000000</TQM-Qpid-02-1M>
 
                         <!-- Transient, Pub/Sub Tests -->
+                        <!-- Concurrency Tests : What are the effects of increasing consumers from 1...30 consumers -->
                         <TTCT-Qpid-01>-n TTCT-Qpid-01         -d1M  -s[10]     -c[1:30]:samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=40    maxPending=2000000 </TTCT-Qpid-01>
                         <TTCT-Qpid-02>-n TTCT-Qpid-02         -d1M  -s[10]     -c[1:30]:samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=40    maxPending=2000000 </TTCT-Qpid-02>
+                        <!-- Latency Tests : What are the effects on latency of increasing consumers from 1...30 consumers -->
                         <TTCL-Qpid-01>-n TTCL-Qpid-01         -d1M  -s[10]     -c[1:30]:samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=40    maxPending=2000000 </TTCL-Qpid-01>
                         <TTCL-Qpid-02>-n TTCL-Qpid-02         -d1M  -s[10]     -c[1:30]:samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=40    maxPending=2000000 </TTCL-Qpid-02>
 
                         <!-- <TTC-Qpid-05>-n TTC-Qpid-05           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TTC-Qpid-05> -->
                         <!-- <TTC-Qpid-06>-n TTC-Qpid-06           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TTC-Qpid-06> -->
 
+                        <!-- Message Size Tests : Tests sending message from 512b upto 1M with Point to Point messaging -->
                         <TTM-Qpid-01-512b>-n TTM-Qpid-01-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-01-512b>
                         <TTM-Qpid-02-512b>-n TTM-Qpid-02-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-02-512b>
                         <TTM-Qpid-01-1K>-n TTM-Qpid-01-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-01-1K>
@@ -295,14 +302,17 @@
                         <TTM-Qpid-02-1M>-n TTM-Qpid-02-1M     -d10M -s[4]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1048476 destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-1M>
 
                         <!-- Persistent, P2P Tests -->
+                        <!-- Concurrency Tests : What are the effects of increasing consumers from 1...30 consumers -->
                         <PQCT-Qpid-01>-n PQCT-Qpid-01         -d1M  -s[1000]   -c[1:30]:samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=600   maxPending=2000000 </PQCT-Qpid-01>
                         <PQCT-Qpid-02>-n PQCT-Qpid-02         -d1M  -s[1000]   -c[1:30]:samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=100   maxPending=2000000 </PQCT-Qpid-02>
+                        <!-- Latency Tests : What are the effects on latency of increasing consumers from 1...30 consumers -->
                         <PQCL-Qpid-01>-n PQCL-Qpid-01         -d1M  -s[1000]   -c[1:30]:samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=600   maxPending=2000000 </PQCL-Qpid-01>
                         <PQCL-Qpid-02>-n PQCL-Qpid-02         -d1M  -s[1000]   -c[1:30]:samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=100   maxPending=2000000 </PQCL-Qpid-02>
 
                         <!-- <PQC-Qpid-05>-n PQC-Qpid-05           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PQC-Qpid-05> -->
                         <!-- <PQC-Qpid-06>-n PQC-Qpid-06           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PQC-Qpid-06> -->
 
+                        <!-- Message Size Tests : Tests sending message from 512b upto 1M with Point to Point messaging -->
                         <PQM-Qpid-01-512b>-n PQM-Qpid-01-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-01-512b>
                         <PQM-Qpid-02-512b>-n PQM-Qpid-02-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-02-512b>
                         <PQM-Qpid-01-1K>-n PQM-Qpid-01-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-01-1K>
@@ -360,6 +370,7 @@
                         <PTBT-TX-Qpid-01>-n PTBT-TX-Qpid-01   -d10M -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PTBT-TX-Qpid-01>
                         <PTBT-AA-Qpid-01>-n PTBT-AA-Qpid-01   -d10M -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PTBT-AA-Qpid-01>
 
+                        <!-- Benchmark Latency testing-->
                         <!-- Job Queueing. 1:10 -->
                         <TQBL-AA-Qpid-02-01>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=1000  maxPending=2000000 </TQBL-AA-Qpid-02-01>
                         <TQBL-AA-Qpid-02-02>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=2000  maxPending=2000000 </TQBL-AA-Qpid-02-02>