summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/ha/Primary.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-07-26 20:08:29 +0000
committerAlan Conway <aconway@apache.org>2012-07-26 20:08:29 +0000
commit5b4a2266079e2902ea6d2786c009c98ba1e76d9d (patch)
tree6604debaee17b2846506792b0207a9f53bad6c3c /qpid/cpp/src/qpid/ha/Primary.cpp
parent636830f7161ee1bc772e7d96716cdb3264002cb7 (diff)
downloadqpid-python-5b4a2266079e2902ea6d2786c009c98ba1e76d9d.tar.gz
QPID-4159: HA missing messages in failover test.
Fix test_failover_send_receive showing missing messages. With this fix, ran with -DDURATION=2 overnight with no failures. - Primary, RemoteBackup: Only report "ready" once per remote backup. - HaBroker: Put membership updates under mutex. - ReplicatingSubscription: Check for backup missing messages at the front. - ha_tests.py: Added assertion to test_priority_ring, verify primary queue as expected. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1366179 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/ha/Primary.cpp')
-rw-r--r--qpid/cpp/src/qpid/ha/Primary.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp
index 1e8c78a240..fd738c6b54 100644
--- a/qpid/cpp/src/qpid/ha/Primary.cpp
+++ b/qpid/cpp/src/qpid/ha/Primary.cpp
@@ -127,7 +127,7 @@ void Primary::checkReady(Mutex::ScopedLock&) {
}
void Primary::checkReady(BackupMap::iterator i, Mutex::ScopedLock& l) {
- if (i != backups.end() && i->second->isReady()) {
+ if (i != backups.end() && i->second->reportReady()) {
BrokerInfo info = i->second->getBrokerInfo();
info.setStatus(READY);
haBroker.addBroker(info);