From 61dcd36ddc850b987440b3ff415105b0cd2d79ac Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Mon, 13 Dec 2010 01:28:42 +0000 Subject: QPID-2970: Updated logging and configuration git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@1044996 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/perftests/etc/dlq/Framework.sh | 4 +- qpid/java/perftests/etc/dlq/Statistics.sh | 4 +- qpid/java/perftests/etc/dlq/Test.sh | 4 +- qpid/java/perftests/etc/dlq/config.properties | 43 ++++++++++++++++------ .../apache/qpid/perftests/dlq/client/Receiver.java | 6 +-- .../perftests/dlq/test/PerformanceStatistics.java | 1 + .../qpid/perftests/dlq/test/PerformanceTest.java | 14 +------ 7 files changed, 43 insertions(+), 33 deletions(-) diff --git a/qpid/java/perftests/etc/dlq/Framework.sh b/qpid/java/perftests/etc/dlq/Framework.sh index 3704e1a593..e9ffc6db30 100755 --- a/qpid/java/perftests/etc/dlq/Framework.sh +++ b/qpid/java/perftests/etc/dlq/Framework.sh @@ -22,7 +22,7 @@ VERSION=0.5 # Setup Java CLASSPATH -CLASSPATH=${QPID_HOME}/lib/qpid-all.jar +CLASSPATH=.:${QPID_HOME}/lib/qpid-all.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/qpid-perftests-${VERSION}.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/slf4j-api-1.4.0.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/slf4j-log4j12-1.4.0.jar @@ -30,5 +30,5 @@ CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/log4j-1.2.12.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/geronimo-jms_1.1_spec-1.0.jar # Run Performance Test Framework -echo "Running DLQ Performance Tests" +echo "Running DLQ Performance Test Framework" java -cp ${CLASSPATH} org.apache.qpid.perftests.dlq.test.PerformanceFramework $* diff --git a/qpid/java/perftests/etc/dlq/Statistics.sh b/qpid/java/perftests/etc/dlq/Statistics.sh index 1e615407de..a856f7ed68 100755 --- a/qpid/java/perftests/etc/dlq/Statistics.sh +++ b/qpid/java/perftests/etc/dlq/Statistics.sh @@ -22,7 +22,7 @@ VERSION=0.5 # Setup Java CLASSPATH -CLASSPATH=${QPID_HOME}/lib/qpid-all.jar +CLASSPATH=.:${QPID_HOME}/lib/qpid-all.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/qpid-perftests-${VERSION}.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/slf4j-api-1.4.0.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/slf4j-log4j12-1.4.0.jar @@ -30,5 +30,5 @@ CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/log4j-1.2.12.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/geronimo-jms_1.1_spec-1.0.jar # Run Performance Test Framework -echo "Running DLQ Performance Tests" +echo "Running DLQ Performance Test Statistics Series" java -cp ${CLASSPATH} org.apache.qpid.perftests.dlq.test.PerformanceStatistics $* diff --git a/qpid/java/perftests/etc/dlq/Test.sh b/qpid/java/perftests/etc/dlq/Test.sh index 713d729bda..f1f1073f3d 100755 --- a/qpid/java/perftests/etc/dlq/Test.sh +++ b/qpid/java/perftests/etc/dlq/Test.sh @@ -22,7 +22,7 @@ VERSION=0.5 # Setup Java CLASSPATH -CLASSPATH=${QPID_HOME}/lib/qpid-all.jar +CLASSPATH=.:${QPID_HOME}/lib/qpid-all.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/qpid-perftests-${VERSION}.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/slf4j-api-1.4.0.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/slf4j-log4j12-1.4.0.jar @@ -30,5 +30,5 @@ CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/log4j-1.2.12.jar CLASSPATH=${CLASSPATH}:${QPID_HOME}/lib/geronimo-jms_1.1_spec-1.0.jar # Run Performance Test Framework -echo "Running DLQ Performance Tests" +echo "Running DLQ Performance Test" java -cp ${CLASSPATH} org.apache.qpid.perftests.dlq.test.PerformanceTest $* diff --git a/qpid/java/perftests/etc/dlq/config.properties b/qpid/java/perftests/etc/dlq/config.properties index b1342158f8..cfc15c7828 100644 --- a/qpid/java/perftests/etc/dlq/config.properties +++ b/qpid/java/perftests/etc/dlq/config.properties @@ -1,24 +1,45 @@ -## qpid redelivery testing +# +# 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. +# -# statistics properties +## qpid dead letter queue performance testing + +## statistics properties repeat = 10 -# shared properties +## shared properties broker = tcp://localhost:5672 maxRedelivery = 3 maxPrefetch = 1 session = SESSION_TRANSACTED +# SESSION_TRANSACTED, AUTO_ACKNOWLEDGE, CLIENT_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE queue = test count = 1000 persistent = true -maxRecords = 10000 +maxRecords = 5000 # must be greater than max(maxPrefetch, count) * threads -# producer properties -size = 4096 -messageIds = true +## producer properties +#size = 4096 +size = 128 +messageIds = true # if false, no message ids will be generated for reject ## consumer properties -threads = 5 -listener = false -reject = 2 -rejectCount = 3 +threads = 5 # total number of consumer clients +listener = false # if true, uses asynchronous message listener +reject = 2 # reject every Nth message +rejectCount = 3 # maximum times each client will reject a message diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java index f38e2c0888..0de3bedded 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java @@ -98,7 +98,7 @@ public class Receiver extends Client int number = msg.getIntProperty("number"); if (number % 100 == 0) { - _log.info("client " + _client + " got message " + number); + _log.debug("client " + _client + " got message " + number); } boolean rejectMessage = (number % _reject) == 0; @@ -116,7 +116,7 @@ public class Receiver extends Client if (rejectCount == _maxRedelivery) { _rejectedCount.incrementAndGet(); - _log.info("client " + _client + " rejecting message (" + rejectCount + ") " + msg.getJMSMessageID()); + _log.debug("client " + _client + " rejecting message (" + rejectCount + ") " + msg.getJMSMessageID()); } if (rejectCount > _maxRedelivery) { @@ -154,7 +154,7 @@ public class Receiver extends Client if (_totalConsumedCount.get() >= _consumedCheck && _rejectedCount.get() >= _rejectedCheck) { - _log.info("stopping receivers after " + _totalConsumedCount.get() + " received and " + _rejectedCount.get() + " rejected"); + _log.debug("stopping receivers after " + _totalConsumedCount.get() + " received and " + _rejectedCount.get() + " rejected"); _stopped = true; _finished.countDown(); } diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/test/PerformanceStatistics.java b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/test/PerformanceStatistics.java index 7f009dbc08..9707521782 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/test/PerformanceStatistics.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/test/PerformanceStatistics.java @@ -93,6 +93,7 @@ public class PerformanceStatistics { return false; } + _log.info("completed individual test run " + i); } } catch (Exception e) diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/test/PerformanceTest.java b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/test/PerformanceTest.java index a3be10a697..c0091c5fac 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/test/PerformanceTest.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/test/PerformanceTest.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; */ public class PerformanceTest { - private static final Logger _log = LoggerFactory.getLogger(PerformanceFramework.class); + private static final Logger _log = LoggerFactory.getLogger(PerformanceTest.class); private static CountDownLatch _latch; @@ -42,13 +42,7 @@ public class PerformanceTest private long _started = 0; private long _finished = 0; - private String _session; private int _count; - private int _reject; - private int _rejectCount; - private int _maxRedelivery; - private boolean _messageIds; - private boolean _listener; public PerformanceTest(File propertyFile) { @@ -84,12 +78,6 @@ public class PerformanceTest _threads = Integer.parseInt(_props.getProperty(THREADS)); _size = Integer.parseInt(_props.getProperty(SIZE)); _count = Integer.parseInt(_props.getProperty(COUNT)); - _reject = Integer.parseInt(_props.getProperty(REJECT)); - _rejectCount = Integer.parseInt(_props.getProperty(REJECT_COUNT)); - _maxRedelivery = Integer.parseInt(_props.getProperty(MAX_REDELIVERY)); - _session = _props.getProperty(SESSION); - _listener = Boolean.parseBoolean(_props.getProperty(LISTENER)); - _messageIds = Boolean.parseBoolean(_props.getProperty(MESSAGE_IDS)); _latch = new CountDownLatch(1); _started = System.nanoTime(); -- cgit v1.2.1