Author: aconway
Date: Wed Jul 18 19:06:02 2012
New Revision: 1363047
URL: http://svn.apache.org/viewvc?rev=1363047&view=rev
Log:
NO-JIRA: HA Minor logging improvements.
Modified:
qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp?rev=1363047&r1=1363046&r2=1363047&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp Wed Jul 18 19:06:02 2012
@@ -288,7 +288,7 @@ void HaBroker::setMembership(const Varia
membership.assign(brokers);
QPID_LOG(debug, logPrefix << "Membership update: " << membership);
BrokerInfo info;
- // Update my status to what the primary thinks.
+ // Update my status to what the primary says.
if (membership.get(systemId, info) && status != info.getStatus())
setStatus(info.getStatus(), l);
membershipUpdated(brokers);
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp?rev=1363047&r1=1363046&r2=1363047&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/Primary.cpp Wed Jul 18 19:06:02 2012
@@ -129,11 +129,10 @@ void Primary::checkReady(Mutex::ScopedLo
void Primary::checkReady(BackupMap::iterator i, Mutex::ScopedLock& l) {
if (i != backups.end() && i->second->isReady()) {
BrokerInfo info = i->second->getBrokerInfo();
- QPID_LOG(info, "Expected backup is ready: " << info);
info.setStatus(READY);
+ QPID_LOG(info, "Expected backup is ready: " << info);
haBroker.addBroker(info);
- expectedBackups.erase(i->second);
- checkReady(l);
+ if (expectedBackups.erase(i->second)) checkReady(l);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
