diff options
Diffstat (limited to 'qpid/java/perftests')
24 files changed, 146 insertions, 86 deletions
diff --git a/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef index ce9e108c09..757a396dff 100644 --- a/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef @@ -17,7 +17,7 @@ # under the License. # -chartType=LINE +chartType=XYLINE chartTitle=Impact of Message Size chartSubtitle=Transient messages xAxisTitle=Message Size (B) @@ -26,3 +26,7 @@ yAxisTitle=Throughput (KB/s) series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' series.1.legend=Current series.1.dir=${csvCurrentDir} + +series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef index d5ad7efbaa..58c280e227 100644 --- a/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef @@ -17,7 +17,7 @@ # under the License. # -chartType=LINE +chartType=XYLINE chartTitle=Impact of Message Size chartSubtitle=Persistent messages xAxisTitle=Message Size (B) @@ -27,4 +27,6 @@ series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE series.1.legend=Current series.1.dir=${csvCurrentDir} -# Define series3/4 to chart the baseline +series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef b/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef index 8dbc5dc04a..f39e7c3d0d 100644 --- a/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef @@ -17,7 +17,7 @@ # under the License. # -chartType=LINE +chartType=XYLINE chartTitle=Varying number of producers chartSubtitle=Persistent 1KB messages xAxisTitle=Producers @@ -34,3 +34,7 @@ series.2.dir=${csvCurrentDir} series.3.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '10' series.3.legend=10 Consumer series.3.dir=${csvCurrentDir} + +series.4.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' +series.4.legend=1 Consumer (baseline) +series.4.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef b/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef index 010093e0c7..0f0b35a7c8 100644 --- a/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef @@ -17,7 +17,7 @@ # under the License. # -chartType=LINE +chartType=XYLINE chartTitle=Varying number of consumers chartSubtitle=Persistent 1KB messages xAxisTitle=Consumers @@ -34,3 +34,7 @@ series.2.dir=${csvCurrentDir} series.3.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' series.3.legend=10 Producers series.3.dir=${csvCurrentDir} + +series.4.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' +series.4.legend=10 Producers (baseline) +series.4.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef b/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef index fc2f72bc29..009ac6d80f 100644 --- a/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef @@ -27,3 +27,7 @@ series.1.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes W series.1.legend=Current series.1.dir=${csvCurrentDir} +series.2.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes WHERE acknowledgeMode = '1' AND participantName = 'All' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} + diff --git a/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef b/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef index 7efbd7202e..5dcfa5a85e 100644 --- a/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef @@ -27,3 +27,6 @@ series.1.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes W series.1.legend=Current series.1.dir=${csvCurrentDir} +series.2.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes WHERE acknowledgeMode = '0' AND participantName = 'All' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef b/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef index 28a4e67194..1f01aa85aa 100644 --- a/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef @@ -17,7 +17,7 @@ # under the License. # -chartType=LINE +chartType=XYLINE chartTitle=Transaction Batch Size chartSubtitle=Persistent 1KB messages xAxisTitle=Batch Size @@ -27,3 +27,7 @@ series.1.statement=SELECT batchSize, throughputKbPerS FROM BatchSize WHERE parti series.1.legend=Current series.1.dir=${csvCurrentDir} +series.2.statement=SELECT batchSize, throughputKbPerS FROM BatchSize WHERE participantName = 'All' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} + diff --git a/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef b/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef index 5c3ef39c3f..42ed69c19d 100644 --- a/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef @@ -27,3 +27,6 @@ series.1.statement=SELECT testName, throughputKbPerS FROM QueueTypes WHERE parti series.1.legend=Current series.1.dir=${csvCurrentDir} +series.2.statement=SELECT testName, throughputKbPerS FROM QueueTypes WHERE participantName = 'All' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef b/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef index 05bfd73b3b..305c5009e2 100644 --- a/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef @@ -17,7 +17,7 @@ # under the License. # -chartType=LINE +chartType=XYLINE chartTitle=Number of topic consumers chartSubtitle=Transient 1KB messages xAxisTitle=Numer of consumers @@ -27,3 +27,6 @@ series.1.statement=SELECT testName, throughputKbPerS FROM Topic-NumberOfConsumer series.1.legend=Current series.1.dir=${csvCurrentDir} +series.2.statement=SELECT testName, throughputKbPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef b/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef index 3d9a04b5b6..9bc53e5a9e 100644 --- a/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef @@ -17,7 +17,7 @@ # under the License. # -chartType=LINE +chartType=XYLINE chartTitle=Number of topics chartSubtitle=Transient 1KB messages xAxisTitle=Numer of topics @@ -26,3 +26,7 @@ yAxisTitle=Throughput (KB/s) series.1.statement=SELECT testName, throughputKbPerS FROM Topic-NumberOfTopics WHERE participantName = 'All' series.1.legend=Current series.1.dir=${csvCurrentDir} + +series.2.statement=SELECT testName, throughputKbPerS FROM Topic-NumberOfTopics WHERE participantName = 'All' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef b/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef index aa449f48c9..ce64d14ac4 100644 --- a/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef @@ -26,3 +26,7 @@ yAxisTitle=Throughput (KB/s) series.1.statement=SELECT isDurableSubscription, throughputKbPerS FROM Topic-Persistence WHERE participantName = 'All Consumers' series.1.legend=Current series.1.dir=${csvCurrentDir} + +series.2.statement=SELECT isDurableSubscription, throughputKbPerS FROM Topic-Persistence WHERE participantName = 'All Consumers' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef b/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef index 6a7e6016f1..5ccc166fc8 100644 --- a/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef +++ b/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef @@ -26,3 +26,7 @@ yAxisTitle=Throughput (KB/s) series.1.statement=SELECT acknowledgeMode, throughputKbPerS FROM Topic-AckModes WHERE participantName = 'All' series.1.legend=Current series.1.dir=${csvCurrentDir} + +series.2.statement=SELECT acknowledgeMode, throughputKbPerS FROM Topic-AckModes WHERE participantName = 'All' +series.2.legend=Baseline +series.2.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef index c4591afd1c..c892ea16cf 100644 --- a/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef +++ b/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef @@ -31,6 +31,10 @@ series.2.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation series.2.legend=Average latency series.2.dir=${csvCurrentDir} -series.3.statement=SELECT payloadSizeB, minLatency,0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers' -series.3.legend=Minimum latency -series.3.dir=${csvCurrentDir} +series.3.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers' +series.3.legend=Average latency (baseline) +series.3.dir=${csvBaselineDir} + +series.4.statement=SELECT payloadSizeB, minLatency,0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers' +series.4.legend=Minimum latency +series.4.dir=${csvCurrentDir} diff --git a/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef index 23ed620fc5..167e62603a 100644 --- a/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef +++ b/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef @@ -31,6 +31,10 @@ series.2.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation series.2.legend=Average latency series.2.dir=${csvCurrentDir} -series.3.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers' -series.3.legend=Minimum latency -series.3.dir=${csvCurrentDir}
\ No newline at end of file +series.3.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers' +series.3.legend=Average latency (baseline) +series.3.dir=${csvBaselineDir} + +series.4.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers' +series.4.legend=Minimum latency +series.4.dir=${csvCurrentDir} diff --git a/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef index c5980e29f6..45c6031b1e 100644 --- a/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef +++ b/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef @@ -31,7 +31,10 @@ series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandard series.2.legend=Average latency series.2.dir=${csvCurrentDir} -series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%' -series.3.legend=Min latency -series.3.dir=${csvCurrentDir} +series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%' +series.3.legend=Average latency (baseline) +series.3.dir=${csvBaselineDir} +series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%' +series.4.legend=Min latency +series.4.dir=${csvCurrentDir} diff --git a/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef index 2bc48d54f4..351a4639b1 100644 --- a/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef +++ b/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef @@ -31,6 +31,10 @@ series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandard series.2.legend=Average latency series.2.dir=${csvCurrentDir} -series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%' -series.3.legend=Min latency -series.3.dir=${csvCurrentDir} +series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%' +series.3.legend=Average latency (baseline) +series.3.dir=${csvBaselineDir} + +series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%' +series.4.legend=Min latency +series.4.dir=${csvCurrentDir} diff --git a/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef index 64e6372ded..9d95075b3d 100644 --- a/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef +++ b/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef @@ -31,6 +31,10 @@ series.2.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandar series.2.legend=Average latency series.2.dir=${csvCurrentDir} -series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT' -series.3.legend=Min latency -series.3.dir=${csvCurrentDir} +series.3.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT' +series.3.legend=Average latency (baseline) +series.3.dir=${csvBaselineDir} + +series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT' +series.4.legend=Min latency +series.4.dir=${csvCurrentDir} diff --git a/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef index eda6256b68..9a323d4044 100644 --- a/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef +++ b/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef @@ -31,7 +31,10 @@ series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandard series.2.legend=Average latency series.2.dir=${csvCurrentDir} -series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%' -series.3.legend=Min latency -series.3.dir=${csvCurrentDir} +series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%' +series.3.legend=Average latency (baseline) +series.3.dir=${csvBaselineDir} +series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%' +series.4.legend=Min latency +series.4.dir=${csvCurrentDir} diff --git a/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef b/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef index 0f3b0103ea..82cf1168ef 100644 --- a/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef +++ b/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef @@ -39,3 +39,6 @@ series.4.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandard series.4.legend=10 producers series.4.dir=${csvCurrentDir} +series.5.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 10 producers - PERSISTENT' +series.5.legend=10 producers (baseline) +series.5.dir=${csvBaselineDir} diff --git a/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef b/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef index 6f5a3724dd..c1aae19376 100644 --- a/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef +++ b/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef @@ -31,6 +31,10 @@ series.2.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM series.2.legend=Average Latency series.2.dir=${csvCurrentDir} -series.3.statement=SELECT testName, minLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers' -series.3.legend=Minimum latency -series.3.dir=${csvCurrentDir} +series.3.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM Latency-QueueTypes WHERE participantName = 'All Consumers' +series.3.legend=Average Latency (baseline) +series.3.dir=${csvBaselineDir} + +series.4.statement=SELECT testName, minLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers' +series.4.legend=Minimum latency +series.4.dir=${csvCurrentDir} diff --git a/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json b/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json index e69f509056..071edf3f0e 100644 --- a/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json +++ b/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json @@ -5,13 +5,11 @@ "_iterations":[ { "_messageSize": 1024, - "_maximumDuration": 30000, "_acknowledgeMode": 1, "_deliveryMode": 1 }, { "_messageSize": 1024, - "_maximumDuration": 30000, "_acknowledgeMode": 0, "_deliveryMode": 1 } @@ -39,7 +37,8 @@ "_producers": [ { "_name": "Producer1", - "_destinationName": "direct://amq.direct//testQueue" + "_destinationName": "direct://amq.direct//testQueue", + "_maximumDuration": 30000 } ] } @@ -59,7 +58,8 @@ "_consumers": [ { "_name": "Consumer1", - "_destinationName": "direct://amq.direct//testQueue" + "_destinationName": "direct://amq.direct//testQueue", + "_maximumDuration": 30000 } ] } @@ -74,13 +74,11 @@ "_iterations":[ { "_messageSize": 1024, - "_maximumDuration": 30000, "_acknowledgeMode": 1, "_deliveryMode": 2 }, { "_messageSize": 1024, - "_maximumDuration": 30000, "_acknowledgeMode": 0, "_deliveryMode": 2 } @@ -104,7 +102,8 @@ "_producers": [ { "_name": "Producer1", - "_destinationName": "direct://amq.direct//testQueue?durable='true'" + "_destinationName": "direct://amq.direct//testQueue?durable='true'", + "_maximumDuration": 30000 } ] } @@ -124,7 +123,8 @@ "_consumers": [ { "_name": "Consumer1", - "_destinationName": "direct://amq.direct//testQueue?durable='true'" + "_destinationName": "direct://amq.direct//testQueue?durable='true'", + "_maximumDuration": 30000 } ] } diff --git a/qpid/java/perftests/etc/testdefs/MessageSize.json b/qpid/java/perftests/etc/testdefs/MessageSize.json index 8fc8e33463..6d796bd824 100644 --- a/qpid/java/perftests/etc/testdefs/MessageSize.json +++ b/qpid/java/perftests/etc/testdefs/MessageSize.json @@ -4,48 +4,37 @@ "_name": "Message Size - 1P-1C - TRANSIENT"; "_iterations":[ { - "_messageSize": 256, - "_maximumDuration": 30000 + "_messageSize": 256 }, { - "_messageSize": 512, - "_maximumDuration": 30000 + "_messageSize": 512 }, { - "_messageSize": 1024, - "_maximumDuration": 30000 + "_messageSize": 1024 }, { - "_messageSize": 2048, - "_maximumDuration": 30000 + "_messageSize": 2048 }, { - "_messageSize": 4096, - "_maximumDuration": 30000 + "_messageSize": 4096 }, { - "_messageSize": 8192, - "_maximumDuration": 30000 + "_messageSize": 8192 }, { - "_messageSize": 16384, - "_maximumDuration": 30000 + "_messageSize": 16384 }, { - "_messageSize": 32768, - "_maximumDuration": 30000 + "_messageSize": 32768 }, { - "_messageSize": 65536, - "_maximumDuration": 30000 + "_messageSize": 65536 }, { - "_messageSize": 131072, - "_maximumDuration": 30000 + "_messageSize": 131072 }, { - "_messageSize": 262144, - "_maximumDuration": 30000 + "_messageSize": 262144 } ], "_queues":[ @@ -73,7 +62,8 @@ { "_name": "Producer1", "_destinationName": "direct://amq.direct//messageSize", - "_deliveryMode": 1 + "_deliveryMode": 1, + "_maximumDuration": 30000 } ] } @@ -94,7 +84,8 @@ "_consumers": [ { "_name": "Consumer1", - "_destinationName": "direct://amq.direct//messageSize" + "_destinationName": "direct://amq.direct//messageSize", + "_maximumDuration": 30000 } ] } @@ -108,48 +99,37 @@ "_name": "Message Size - 1P-1C - PERSISTENT"; "_iterations":[ { - "_messageSize": 256, - "_maximumDuration": 30000 + "_messageSize": 256 }, { - "_messageSize": 512, - "_maximumDuration": 30000 + "_messageSize": 512 }, { - "_messageSize": 1024, - "_maximumDuration": 30000 + "_messageSize": 1024 }, { - "_messageSize": 2048, - "_maximumDuration": 30000 + "_messageSize": 2048 }, { - "_messageSize": 4096, - "_maximumDuration": 30000 + "_messageSize": 4096 }, { - "_messageSize": 8192, - "_maximumDuration": 30000 + "_messageSize": 8192 }, { - "_messageSize": 16384, - "_maximumDuration": 30000 + "_messageSize": 16384 }, { - "_messageSize": 32768, - "_maximumDuration": 30000 + "_messageSize": 32768 }, { - "_messageSize": 65536, - "_maximumDuration": 30000 + "_messageSize": 65536 }, { - "_messageSize": 131072, - "_maximumDuration": 30000 + "_messageSize": 131072 }, { - "_messageSize": 262144, - "_maximumDuration": 30000 + "_messageSize": 262144 } ], "_queues":[ @@ -178,7 +158,9 @@ { "_name": "Producer1", "_destinationName": "direct://amq.direct//messageSize?durable='true'", - "_deliveryMode": 2 + "_deliveryMode": 2, + "_maximumDuration": 30000 + } ] } @@ -199,7 +181,8 @@ "_consumers": [ { "_name": "Consumer1", - "_destinationName": "direct://amq.direct//messageSize?durable='true'" + "_destinationName": "direct://amq.direct//messageSize?durable='true'", + "_maximumDuration": 30000 } ] } diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java index 368a25c929..f9d50e8e64 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java @@ -86,6 +86,8 @@ public class ConsumerParticipant implements Participant } else { + LOGGER.info("Consumer {} registering listener", getName()); + _jmsDelegate.registerListener(_command.getParticipantName(), new MessageListener(){ @Override @@ -120,7 +122,7 @@ public class ConsumerParticipant implements Participant private void synchronousRun() { - LOGGER.debug("entered synchronousRun: " + this); + LOGGER.info("Consumer {} about to consume messages", getName()); _startTime = System.currentTimeMillis(); diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java index c02c4faed9..63cbe98b5c 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java @@ -78,6 +78,8 @@ public class ProducerParticipant implements Participant _limiter = ExecutorWithLimitsFactory.createExecutorWithLimit(startTime, requiredDuration); + LOGGER.info("Producer {} about to send messages", getName()); + while (true) { try @@ -162,6 +164,7 @@ public class ProducerParticipant implements Participant long sleepTime = _command.getStartDelay(); if (sleepTime > 0) { + LOGGER.debug("{} sleeping for {} milliseconds before starting", getName(), sleepTime); // start delay is specified. Sleeping... doSleep(sleepTime); } |