summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/ha/Primary.h
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-09-14 18:48:09 +0000
committerAlan Conway <aconway@apache.org>2012-09-14 18:48:09 +0000
commit5c73472bc29bb0dfcfda168ad81e0bb5025a3077 (patch)
tree3eb45e481a828824e6c8e6589ad79150b67ecdeb /qpid/cpp/src/qpid/ha/Primary.h
parentcef26777e4d9ed0874e21344994abfaf8fef9a60 (diff)
downloadqpid-python-5c73472bc29bb0dfcfda168ad81e0bb5025a3077.tar.gz
QPID-4223: HA Completion isn't sent when queue that has acquired but unacknowledged messages is deleted
- Extended ha_test.py test_failover_send_receive to kill backup as well as primary - QueueRegistry::destroy was not calling observer. - Primary removes disconnected brokers backups and expectedBackups - Primary calls checkReady in all cases where broker is removed from expectedBackups git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1384882 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/ha/Primary.h')
-rw-r--r--qpid/cpp/src/qpid/ha/Primary.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/ha/Primary.h b/qpid/cpp/src/qpid/ha/Primary.h
index 26883f4416..22b231ed72 100644
--- a/qpid/cpp/src/qpid/ha/Primary.h
+++ b/qpid/cpp/src/qpid/ha/Primary.h
@@ -95,13 +95,12 @@ class Primary
bool active;
/**
* Set of expected backups that must be ready before we declare ourselves
- * active
+ * active. These are backups that were known before the primary crashed. As
+ * new primary we expect them to re-connect.
*/
BackupSet expectedBackups;
/**
- * Map of all the remote backups we know about: any expected backups plus
- * all actual backups that have connected. We do not remove entries when a
- * backup disconnects. @see Primary::closed()
+ * Map of all the expected backups plus all connected backups.
*/
BackupMap backups;
boost::shared_ptr<broker::ConnectionObserver> connectionObserver;