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 2012/07/19 21:16:04 UTC
svn commit: r1363485 - in /qpid/branches/0.18/qpid/cpp/src/qpid/ha:
BrokerReplicator.cpp HaBroker.cpp Membership.cpp Membership.h
Author: aconway
Date: Thu Jul 19 19:16:03 2012
New Revision: 1363485
URL: http://svn.apache.org/viewvc?rev=1363485&view=rev
Log:
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.
Modified:
qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp
qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.cpp
qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.h
Modified: qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp?rev=1363485&r1=1363484&r2=1363485&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp (original)
+++ qpid/branches/0.18/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp Thu Jul 19 19:16:03 2012
@@ -440,7 +440,6 @@ void BrokerReplicator::doEventUnbind(Var
void BrokerReplicator::doEventMembersUpdate(Variant::Map& values) {
Variant::List members = values[MEMBERS].asList();
- QPID_LOG(debug, logPrefix << "Membership update event: " << members);
haBroker.setMembership(members);
}
Modified: qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp?rev=1363485&r1=1363484&r2=1363485&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp (original)
+++ qpid/branches/0.18/qpid/cpp/src/qpid/ha/HaBroker.cpp Thu Jul 19 19:16:03 2012
@@ -288,6 +288,7 @@ void HaBroker::membershipUpdated(const V
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 &&
Modified: qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.cpp?rev=1363485&r1=1363484&r2=1363485&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.cpp (original)
+++ qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.cpp Thu Jul 19 19:16:03 2012
@@ -78,4 +78,8 @@ bool Membership::get(const types::Uuid&
return true;
}
+std::ostream& operator<<(std::ostream& o, const Membership& members) {
+ return o << members.brokers;
+}
+
}} // namespace qpid::ha
Modified: qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.h?rev=1363485&r1=1363484&r2=1363485&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.h (original)
+++ qpid/branches/0.18/qpid/cpp/src/qpid/ha/Membership.h Thu Jul 19 19:16:03 2012
@@ -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*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org