You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/03/30 22:57:23 UTC
svn commit: r929276 - in /qpid/trunk/qpid/cpp/src: qpid/cluster/Cluster.cpp
qpid/cluster/PollableQueue.h tests/failover_soak.cpp
Author: aconway
Date: Tue Mar 30 20:57:22 2010
New Revision: 929276
URL: http://svn.apache.org/viewvc?rev=929276&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/PollableQueue.h
qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=929276&r1=929275&r2=929276&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Tue Mar 30 20:57:22 2010
@@ -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();
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/PollableQueue.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/PollableQueue.h?rev=929276&r1=929275&r2=929276&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/PollableQueue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/PollableQueue.h Tue Mar 30 20:57:22 2010
@@ -74,10 +74,7 @@ template <class T> class PollableQueue :
else sys::PollableQueue<T>::push(t);
}
- void start() {
- bypass = false;
- sys::PollableQueue<T>::start();
- }
+ void bypassOff() { bypass = false; }
private:
Callback callback;
Modified: qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp?rev=929276&r1=929275&r2=929276&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp Tue Mar 30 20:57:22 2010
@@ -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")) {
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org