diff options
| author | Keith Wall <kwall@apache.org> | 2012-07-17 14:09:37 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-07-17 14:09:37 +0000 |
| commit | 0e22d4ab6aaa6d300eb150dde3a4702cace043c5 (patch) | |
| tree | dd8c8db6732ac2650384db5e79376777ea181902 /qpid/java/perftests/etc | |
| parent | 1b11ea556b73c4374a1c93d8707dc9aa57b209e1 (diff) | |
| download | qpid-python-0e22d4ab6aaa6d300eb150dde3a4702cace043c5.tar.gz | |
QPID-4143: tweaked topic test config to introduce a start delay on message production, allowing the consumers enough time to implicitly create the queues (unfortunately the Qpid client can't explicitly create topics).
Also improved error reporting and increased time outs to better cope with large scale tests.
Applied patch from Philip Harvey <phil@philharveyonline.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1362502 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/perftests/etc')
6 files changed, 9 insertions, 5 deletions
diff --git a/qpid/java/perftests/etc/log4j.properties b/qpid/java/perftests/etc/log4j.properties index 60e15d0817..ec00e022ac 100644 --- a/qpid/java/perftests/etc/log4j.properties +++ b/qpid/java/perftests/etc/log4j.properties @@ -25,4 +25,4 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.Threshold=all log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d %p [%c{1}] %m%n
\ No newline at end of file +log4j.appender.console.layout.ConversionPattern=%d %p [%t] [%c{1}] %m%n diff --git a/qpid/java/perftests/etc/perftests-jndi.properties b/qpid/java/perftests/etc/perftests-jndi.properties index 8ad0decaad..04a8ad9101 100644 --- a/qpid/java/perftests/etc/perftests-jndi.properties +++ b/qpid/java/perftests/etc/perftests-jndi.properties @@ -23,4 +23,4 @@ java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextF # use QpidBrokerTestCase's default port connectionfactory.connectionfactory = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672' -destination.controllerqueue = direct://amq.direct//controllerqueue +destination.controllerqueue = direct://amq.direct//controllerqueue?autodelete='true' diff --git a/qpid/java/perftests/etc/testdefs/Topic-AckModes.js b/qpid/java/perftests/etc/testdefs/Topic-AckModes.js index 0ad519aa50..5c4dee88e3 100644 --- a/qpid/java/perftests/etc/testdefs/Topic-AckModes.js +++ b/qpid/java/perftests/etc/testdefs/Topic-AckModes.js @@ -30,7 +30,8 @@ var jsonObject = { { "_name": "Producer", "_destinationName": topicName, - "_maximumDuration": duration + "_maximumDuration": duration, + "_startDelay": 2000 // gives the consumers time to implicitly create the topic } ] } diff --git a/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js b/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js index 9351987115..751b8b1528 100644 --- a/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js +++ b/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js @@ -26,7 +26,8 @@ for(i=0; i < numbersOfConsumers.length ; i++) { "_name": "Producer1", "_destinationName": topicName, - "_maximumDuration": duration + "_maximumDuration": duration, + "_startDelay": 2000 // gives the consumers time to implicitly create the topic } ] } diff --git a/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js b/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js index 227650a16d..89e5ecf56c 100644 --- a/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js +++ b/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js @@ -29,7 +29,8 @@ for(i=0; i < numbersOfTopics.length ; i++) { "_name": "Producer-__INDEX", "_destinationName": topicName, - "_maximumDuration": duration + "_maximumDuration": duration, + "_startDelay": 2000 // gives the consumers time to implicitly create the topic } ] } diff --git a/qpid/java/perftests/etc/testdefs/Topic-Persistence.js b/qpid/java/perftests/etc/testdefs/Topic-Persistence.js index d843d37861..fd92560fc3 100644 --- a/qpid/java/perftests/etc/testdefs/Topic-Persistence.js +++ b/qpid/java/perftests/etc/testdefs/Topic-Persistence.js @@ -32,6 +32,7 @@ var jsonObject = { "_name": "Producer", "_destinationName": topicName, "_maximumDuration": duration, + "_startDelay": 2000 // gives the consumers time to implicitly create the topic } ] } |