From ef98f2d05fabd0cf8dceb5f02394be00345bf30c Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Wed, 24 Dec 2014 12:01:15 +0000 Subject: QPID-6284: [Java Broker Tests] Add new chart defintion for the newSSL perf test. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1647766 13f79535-47bb-0310-9956-ffa450edef68 --- ...-VaryingNumberOfProducers-SessionTrans.chartdef | 22 +++++++--- ...-VaryingNumberOfConsumers-SessionTrans.chartdef | 22 +++++++--- .../etc/chartdefs/1060-SSLConnections.chartdef | 49 ++++++++++++++++++++++ .../etc/testdefs/VaryingNumberOfParticipants.js | 4 +- .../etc/testdefs/VaryingNumberOfParticipantsSSL.js | 4 +- .../java/perftests/etc/visualisation-timeseries.sh | 33 --------------- qpid/java/perftests/etc/visualisation.sh | 36 ---------------- qpid/java/perftests/visualisation-jfc/pom.xml | 46 ++++++++++++++++++++ 8 files changed, 131 insertions(+), 85 deletions(-) create mode 100644 qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef delete mode 100755 qpid/java/perftests/etc/visualisation-timeseries.sh delete mode 100755 qpid/java/perftests/etc/visualisation.sh (limited to 'qpid/java/perftests') diff --git a/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef b/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef index 7561ea33f6..0d11f7014b 100644 --- a/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef @@ -20,7 +20,7 @@ chartType=XYLINE chartTitle=Varying number of producers - transacted chartSubtitle=Persistent 1KB messages -chartDescription=1,2,5,10 P/Cs, single queue, persistent, transacted, with message payload 1KB. +chartDescription=1,2,5,10,20,40 P/Cs, single queue, persistent, transacted, with message payload 1KB. xAxisTitle=Producers yAxisTitle=Throughput (messages/s) @@ -40,8 +40,18 @@ series.3.legend=10 Consumer series.3.dir=${csvCurrentDir} series.3.colourName=green -series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '0' -series.4.legend=1 Consumer (baseline ${baselineName}) -series.4.dir=${csvBaselineDir} -series.4.colourName=dark_red -series.4.strokeWidth=-1 +series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '20' and acknowledgeMode = '0' +series.4.legend=20 Consumer +series.4.dir=${csvCurrentDir} +series.4.colourName=magenta + +series.5.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '40' and acknowledgeMode = '0' +series.5.legend=40 Consumer +series.5.dir=${csvCurrentDir} +series.5.colourName=orange + +series.6.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '0' +series.6.legend=1 Consumer (baseline ${baselineName}) +series.6.dir=${csvBaselineDir} +series.6.colourName=dark_red +series.6.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef b/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef index f567ffade6..bd3f6a457a 100644 --- a/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef @@ -20,7 +20,7 @@ chartType=XYLINE chartTitle=Varying number of consumers - transacted chartSubtitle=Persistent 1KB messages -chartDescription=1,2,5,10 P/Cs, single queue, persistent, transacted, with message payload 1KB. +chartDescription=1,2,5,10,20,40 P/Cs, single queue, persistent, transacted, with message payload 1KB. xAxisTitle=Consumers yAxisTitle=Throughput (messages/s) @@ -40,8 +40,18 @@ series.3.legend=10 Producers series.3.dir=${csvCurrentDir} series.3.colourName=red -series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '0' -series.4.legend=10 Producers (baseline ${baselineName}) -series.4.dir=${csvBaselineDir} -series.4.colourName=dark_red -series.4.strokeWidth=-1 +series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '20' and acknowledgeMode = '0' +series.4.legend=20 Producers +series.4.dir=${csvCurrentDir} +series.4.colourName=magenta + +series.5.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '40' and acknowledgeMode = '0' +series.5.legend=40 Producers +series.5.dir=${csvCurrentDir} +series.5.colourName=yellow + +series.6.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '0' +series.6.legend=10 Producers (baseline ${baselineName}) +series.6.dir=${csvBaselineDir} +series.6.colourName=dark_red +series.6.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef b/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef new file mode 100644 index 0000000000..90cb06d5c7 --- /dev/null +++ b/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef @@ -0,0 +1,49 @@ +# +# 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. +# + +chartType=LINE +chartTitle=Effect of SSL - transacted +chartSubtitle=Persistent 1KB messages +chartDescription=Matching number of P/Cs, single queue, persistent, transacted, with message payload 1KB. + +xAxisTitle=Number of producers and consumers on separate connections +yAxisTitle=Throughput (messages/s) + +series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0' +series.1.legend=Plain +series.1.dir=${csvCurrentDir} +series.1.colourName=red + +series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0' +series.2.legend=Plain (baseline ${baselineName}) +series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.strokeWidth=-1 + +series.3.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipantsSSL WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0' +series.3.legend=SSL +series.3.dir=${csvCurrentDir} +series.3.colourName=blue + +series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipantsSSL WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0' +series.4.legend=SSL (baseline ${baselineName}) +series.4.dir=${csvBaselineDir} +series.4.colourName=dark_blue +series.4.strokeWidth=-1 + diff --git a/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js b/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js index fd6c650e90..1e04a89383 100644 --- a/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js +++ b/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js @@ -25,8 +25,8 @@ var jsonObject = { var duration = 30000; var queueName = "direct://amq.direct//varNumOfParticipants?durable='true'"; -var numbersOfProducers = [1, 2, 5, 10, 20]; -var numbersOfConsumers = [1, 2, 5, 10, 20]; +var numbersOfProducers = [1, 2, 5, 10, 20, 40]; +var numbersOfConsumers = [1, 2, 5, 10, 20, 40]; for(producersIndex=0; producersIndex < numbersOfProducers.length; producersIndex++) { diff --git a/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js b/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js index 0090b5aa8c..03d94c5ed6 100644 --- a/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js +++ b/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js @@ -25,8 +25,8 @@ var jsonObject = { var duration = 30000; var queueName = "direct://amq.direct//varNumOfParticipantsSsl?durable='true'"; -var numbersOfProducers = [1, 2, 5, 10, 20]; -var numbersOfConsumers = [1, 2, 5, 10, 20]; +var numbersOfProducers = [1, 2, 5, 10, 20, 40]; +var numbersOfConsumers = [1, 2, 5, 10, 20, 40]; for(producersIndex=0; producersIndex < numbersOfProducers.length; producersIndex++) { diff --git a/qpid/java/perftests/etc/visualisation-timeseries.sh b/qpid/java/perftests/etc/visualisation-timeseries.sh deleted file mode 100755 index 3f35b9047c..0000000000 --- a/qpid/java/perftests/etc/visualisation-timeseries.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - -# Runs the visualisation tool against perftest output assumed to be in a Derby database in the current directory - -BASE_DIR=`dirname $0` - -# Uncomment to read perftest data from a Derby database -JDBC_URL=jdbcUrl=jdbc:derby:perftestResultsDb -JDBC_DRIVER=jdbcDriverClass=org.apache.derby.jdbc.EmbeddedDriver - -java -cp "${BASE_DIR}:${BASE_DIR}/../../build/lib/*" \ - -Djava.awt.headless=true -Dlog4j.configuration=file:log4j.properties \ - org.apache.qpid.disttest.charting.ChartingUtil \ - chart-defs=chartdefs/timeseries \ - ${JDBC_DRIVER} ${JDBC_URL} diff --git a/qpid/java/perftests/etc/visualisation.sh b/qpid/java/perftests/etc/visualisation.sh deleted file mode 100755 index 4c10d7e2e2..0000000000 --- a/qpid/java/perftests/etc/visualisation.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - -# Runs the visualisation tool against perftest CSV output assumed to be in the current directory - -BASE_DIR=`dirname $0` - -# Uncomment to read perftest data from a Derby database -# JDBC_URL=jdbcUrl=jdbc:derby:perftestResultsDb -# JDBC_DRIVER=jdbcDriverClass=org.apache.derby.jdbc.EmbeddedDriver - -java -cp "${BASE_DIR}:${BASE_DIR}/../../build/lib/*" \ - -Djava.awt.headless=true -Dlog4j.configuration=file:log4j.properties \ - -DcsvCurrentDir=/home/V510279/tasks/_old/PerfTestDryRun/etc/ \ - -DcsvBaselineDir=/home/V510279/tasks/_old/PerfTestDryRun/etc/ \ - -DbaselineName=${BASELINE_NAME} \ - org.apache.qpid.disttest.charting.ChartingUtil \ - chart-defs=chartdefs \ - ${JDBC_DRIVER} ${JDBC_URL} diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml index e99bde0102..2d0ccb60c3 100644 --- a/qpid/java/perftests/visualisation-jfc/pom.xml +++ b/qpid/java/perftests/visualisation-jfc/pom.xml @@ -120,6 +120,52 @@ true + + + org.codehaus.mojo + exec-maven-plugin + 1.3.2 + + + + java + + + + + org.apache.qpid.disttest.charting.ChartingUtil + true + + chart-defs=${basedir}/../etc/chartdefs + + + + log4j.configurationfile:log4j.properties + + + java.awt.headlesstrue + + + csvCurrentDir${basedir}/../target/data/current + + + csvBaselineDir${basedir}/../target/data/baseline + + + + + + net.sourceforge.csvjdbc + csvjdbc + ${csvjdbc-version} + + + jfree + jfreechart + ${jfreechart-version} + + + -- cgit v1.2.1