diff options
| author | Alan Conway <aconway@apache.org> | 2014-11-22 02:54:59 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2014-11-22 02:54:59 +0000 |
| commit | 372554badd0d3ca844cb6b894bc6bdc4ac9a6aed (patch) | |
| tree | cc221eb0344ebaae87e3b2b257274de2a0683924 /qpid/cpp/src/tests | |
| parent | 3c2d3f0aee5fdfe535ce65db2190a9297a3135b4 (diff) | |
| download | qpid-python-372554badd0d3ca844cb6b894bc6bdc4ac9a6aed.tar.gz | |
NO-JIRA: Fix qpid-cpp-benchmark to work with activemq broker.
The activemq broker appears not to respect the AMQP drain flag, so calling fetch() on
an empty queue hangs. Use get() with a timeout instead to drain the queues.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1641027 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rwxr-xr-x | qpid/cpp/src/tests/qpid-cpp-benchmark | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/qpid-cpp-benchmark b/qpid/cpp/src/tests/qpid-cpp-benchmark index 70a8a849ad..2d5ec711fe 100755 --- a/qpid/cpp/src/tests/qpid-cpp-benchmark +++ b/qpid/cpp/src/tests/qpid-cpp-benchmark @@ -78,6 +78,8 @@ op.add_option("--connection-options", type="str", help="Connection options for senders & receivers") op.add_option("--durable", default=False, action="store_true", help="Use durable queues and messages") +op.add_option("-t", "--timeout", default=1.0, type="float", metavar="SECONDS", + help="Timeout for fetch operations (default %default)") op.add_option("--save-received", default=False, action="store_true", help="Save received message content to files <queuename>-receiver-<n>.msg") op.add_option("--verbose", default=False, action="store_true", @@ -195,7 +197,11 @@ def drain(queue, session, opts): n = 0 try: while True: - r.fetch(timeout=0) + # FIXME aconway 2014-11-21: activemq broker does not respect the drain flag + # so fetch on an empty queue will hang forever, use get with timeout instead. + # r.fetch(timeout=0) + m = qm.Message() + r.get(timeout=opts.timeout) n += 1 if n % 500 == 0: r.session.acknowledge() r.session.acknowledge() @@ -271,7 +277,7 @@ class ReadyReceiver: self.connection = connect(broker, opts) self.receiver = self.connection.session().receiver(queue) self.receiver.session.sync() - self.timeout=10 + self.timeout=opts.timeout def wait(self, receivers): try: |