QPID-4138: HA sporadic failure in ha_tests

This was another test issue: trace logging had been left on by mistake, which was
slowing down the tests to the point they were hitting test time-outs.

Also in this patch: Include symbolic satus in membership update log message.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1361393 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 8 insertions, 2 deletions

diff --git a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
index 4dd9947f90..de0d0602dc 100644
--- a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
@@ -436,7 +436,6 @@ void BrokerReplicator::doEventUnbind(Variant::Map& values) {
 
 void BrokerReplicator::doEventMembersUpdate(Variant::Map& values) {
     Variant::List members = values[MEMBERS].asList();
-    QPID_LOG(debug, logPrefix << "Membership update event: " <<  members);
     haBroker.setMembership(members);
 }
 
diff --git a/qpid/cpp/src/qpid/ha/HaBroker.cpp b/qpid/cpp/src/qpid/ha/HaBroker.cpp
index 858f04e198..4fc0317fe5 100644
--- a/qpid/cpp/src/qpid/ha/HaBroker.cpp
+++ b/qpid/cpp/src/qpid/ha/HaBroker.cpp
@@ -288,6 +288,7 @@ void HaBroker::membershipUpdated(const Variant::List& brokers) {
 void HaBroker::setMembership(const Variant::List& brokers) {
     Mutex::ScopedLock l(lock);
     membership.assign(brokers);
+    QPID_LOG(debug, logPrefix << "Membership update: " <<  membership);
     BrokerInfo info;
     // Check if my own status has been updated to READY
     if (getStatus() == CATCHUP &&
diff --git a/qpid/cpp/src/qpid/ha/Membership.cpp b/qpid/cpp/src/qpid/ha/Membership.cpp
index b85c4d4164..cc2906dd8f 100644
--- a/qpid/cpp/src/qpid/ha/Membership.cpp
+++ b/qpid/cpp/src/qpid/ha/Membership.cpp
@@ -78,4 +78,8 @@ bool Membership::get(const types::Uuid& id, BrokerInfo& result) {
     return true;
 }
 
+std::ostream& operator<<(std::ostream& o, const Membership& members) {
+    return o << members.brokers;
+}
+
 }} // namespace qpid::ha
diff --git a/qpid/cpp/src/qpid/ha/Membership.h b/qpid/cpp/src/qpid/ha/Membership.h
index 41245f0e06..3bd8653a64 100644
--- a/qpid/cpp/src/qpid/ha/Membership.h
+++ b/qpid/cpp/src/qpid/ha/Membership.h
@@ -58,8 +58,11 @@ class Membership
   private:
     types::Uuid self;
     BrokerInfo::Map brokers;
+    friend std::ostream& operator<<(std::ostream&, const Membership&);
 };
 
+std::ostream& operator<<(std::ostream&, const Membership&);
+
 }} // namespace qpid::ha
 
 #endif  /*!QPID_HA_MEMBERSHIP_H*/
diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py
index 6f8fa344d5..0c4fd4dcc8 100755
--- a/qpid/cpp/src/tests/ha_tests.py
+++ b/qpid/cpp/src/tests/ha_tests.py
@@ -63,7 +63,6 @@ class HaBroker(Broker):
         args = copy(args)
         args += ["--load-module", BrokerTest.ha_lib,
                  "--log-enable=debug+:ha::",
-                 "--log-enable=trace+:ha::", # FIXME aconway 2012-07-12: 
                  # FIXME aconway 2012-02-13: workaround slow link failover.
                  "--link-maintenace-interval=0.1",
                  "--ha-cluster=%s"%ha_cluster]