diff options
| author | Alan Conway <aconway@apache.org> | 2010-03-30 20:57:22 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-03-30 20:57:22 +0000 |
| commit | 9c00a0a3ecc8139c567b74738f7cfd4cd2ec6bc5 (patch) | |
| tree | 4d574172fd2b6fc0adccac03eb32cbcb489c1bfa /cpp | |
| parent | d13a8d895087b0a8e5a3535466bd8a5d065ae6be (diff) | |
| download | qpid-python-9c00a0a3ecc8139c567b74738f7cfd4cd2ec6bc5.tar.gz | |
Fix hanging failover_soak test.
Explictly turn off PollableQueue bypass mode during initialize.
Implicitly turning it off in PollableQueue::start() led to incorrectly
turning off bypass in a PRE_INIT client when an offer was processed.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@929276 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/cluster/PollableQueue.h | 5 | ||||
| -rw-r--r-- | cpp/src/tests/failover_soak.cpp | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 83ebbcc2e6..258460fe8f 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -319,7 +319,9 @@ void Cluster::initialize() { broker.getKnownBrokers = boost::bind(&Cluster::getUrls, this); broker.setExpiryPolicy(expiryPolicy); dispatcher.start(); + deliverEventQueue.bypassOff(); deliverEventQueue.start(); + deliverFrameQueue.bypassOff(); deliverFrameQueue.start(); mcast.start(); diff --git a/cpp/src/qpid/cluster/PollableQueue.h b/cpp/src/qpid/cluster/PollableQueue.h index 59d0bcd36a..10e2ed6ac3 100644 --- a/cpp/src/qpid/cluster/PollableQueue.h +++ b/cpp/src/qpid/cluster/PollableQueue.h @@ -74,10 +74,7 @@ template <class T> class PollableQueue : public sys::PollableQueue<T> { else sys::PollableQueue<T>::push(t); } - void start() { - bypass = false; - sys::PollableQueue<T>::start(); - } + void bypassOff() { bypass = false; } private: Callback callback; diff --git a/cpp/src/tests/failover_soak.cpp b/cpp/src/tests/failover_soak.cpp index 8bf6eca9e6..cd7aaa6614 100644 --- a/cpp/src/tests/failover_soak.cpp +++ b/cpp/src/tests/failover_soak.cpp @@ -337,7 +337,6 @@ startNewBroker ( brokerVector & brokers, int verbosity, int durable ) { - // ("--log-enable=notice+") static int brokerId = 0; stringstream path, prefix; prefix << "soak-" << brokerId; @@ -348,7 +347,8 @@ startNewBroker ( brokerVector & brokers, ("--mgmt-enable=no") ("--log-prefix")(prefix.str()) ("--log-to-file")(prefix.str()+".log") - ("--log-enable=notice+") + ("--log-enable=info+") + ("--log-enable=debug+:cluster") ("TMP_DATA_DIR"); if (endsWith(moduleOrDir, "cluster.so")) { |