You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/12/24 13:01:15 UTC
svn commit: r1647766 - in /qpid/trunk/qpid/java/perftests: etc/
etc/chartdefs/ etc/testdefs/ visualisation-jfc/
Author: kwall
Date: Wed Dec 24 12:01:15 2014
New Revision: 1647766
URL: http://svn.apache.org/r1647766
Log:
QPID-6284: [Java Broker Tests] Add new chart defintion for the newSSL perf test.
Added:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef
- copied, changed from r1647568, qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
Removed:
qpid/trunk/qpid/java/perftests/etc/visualisation-timeseries.sh
qpid/trunk/qpid/java/perftests/etc/visualisation.sh
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js
qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef?rev=1647766&r1=1647765&r2=1647766&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef Wed Dec 24 12:01:15 2014
@@ -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
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef?rev=1647766&r1=1647765&r2=1647766&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef Wed Dec 24 12:01:15 2014
@@ -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
Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef (from r1647568, qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef&r1=1647568&r2=1647766&rev=1647766&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef Wed Dec 24 12:01:15 2014
@@ -17,31 +17,33 @@
# under the License.
#
-chartType=XYLINE
-chartTitle=Varying number of producers - transacted
+chartType=LINE
+chartTitle=Effect of SSL - transacted
chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10 P/Cs, single queue, persistent, transacted, with message payload 1KB.
+chartDescription=Matching number of P/Cs, single queue, persistent, transacted, with message payload 1KB.
-xAxisTitle=Producers
+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 = '1' and acknowledgeMode = '0'
-series.1.legend=1 Consumer
+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 = '5' and acknowledgeMode = '0'
-series.2.legend=5 Consumer
-series.2.dir=${csvCurrentDir}
-series.2.colourName=blue
+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 VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '10' and acknowledgeMode = '0'
-series.3.legend=10 Consumer
+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=green
+series.3.colourName=blue
-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.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_red
+series.4.colourName=dark_blue
series.4.strokeWidth=-1
+
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js?rev=1647766&r1=1647765&r2=1647766&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js Wed Dec 24 12:01:15 2014
@@ -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++)
{
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js?rev=1647766&r1=1647765&r2=1647766&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js Wed Dec 24 12:01:15 2014
@@ -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++)
{
Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml?rev=1647766&r1=1647765&r2=1647766&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml Wed Dec 24 12:01:15 2014
@@ -120,6 +120,52 @@
<skip>true</skip>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.3.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.apache.qpid.disttest.charting.ChartingUtil</mainClass>
+ <includePluginDependencies>true</includePluginDependencies>
+ <arguments>
+ <argument>chart-defs=${basedir}/../etc/chartdefs</argument>
+ </arguments>
+ <systemProperties>
+ <systemProperty>
+ <key>log4j.configuration</key><value>file:log4j.properties</value>
+ </systemProperty>
+ <systemProperty>
+ <key>java.awt.headless</key><value>true</value>
+ </systemProperty>
+ <systemProperty>
+ <key>csvCurrentDir</key><value>${basedir}/../target/data/current</value>
+ </systemProperty>
+ <systemProperty>
+ <key>csvBaselineDir</key><value>${basedir}/../target/data/baseline</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.csvjdbc</groupId>
+ <artifactId>csvjdbc</artifactId>
+ <version>${csvjdbc-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>${jfreechart-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org