diff options
Diffstat (limited to 'cpp/src/qpid/ha/RemoteBackup.h')
-rw-r--r-- | cpp/src/qpid/ha/RemoteBackup.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cpp/src/qpid/ha/RemoteBackup.h b/cpp/src/qpid/ha/RemoteBackup.h index 8ee776e90b..769c50457e 100644 --- a/cpp/src/qpid/ha/RemoteBackup.h +++ b/cpp/src/qpid/ha/RemoteBackup.h @@ -33,6 +33,7 @@ namespace qpid { namespace broker { class Queue; class QueueRegistry; +class Connection; } namespace ha { @@ -54,20 +55,20 @@ class RemoteBackup /** Note: isReady() can be true after construction *@param connected true if the backup is already connected. */ - RemoteBackup(const BrokerInfo& info, ReplicationTest, bool connected); + RemoteBackup(const BrokerInfo&, broker::Connection*); ~RemoteBackup(); - /** Set the initial queues for all queues in the registry. - *@createGuards if true create guards also, if false guards will be created on demand. + /** Set all queues in the registry as catch-up queues. + *@createGuards if true create guards also, if false guards are created on demand. */ - void setInitialQueues(broker::QueueRegistry&, bool createGuards); + void setCatchupQueues(broker::QueueRegistry&, bool createGuards); /** Return guard associated with a queue. Used to create ReplicatingSubscription. */ GuardPtr guard(const QueuePtr&); /** Is the remote backup connected? */ - void setConnected(bool b) { connected=b; } - bool isConnected() const { return connected; } + void setConnection(broker::Connection* c) { connection = c; } + bool isConnected() const { return connection; } /** ReplicatingSubscription associated with queue is ready. * Note: may set isReady() @@ -80,7 +81,7 @@ class RemoteBackup /** Called via ConfigurationObserver. Note: may set isReady() */ void queueDestroy(const QueuePtr&); - /**@return true when all initial queues for this backup are ready. */ + /**@return true when all catch-up queues for this backup are ready. */ bool isReady(); /**@return true if isReady() and this is the first call to reportReady */ @@ -94,15 +95,14 @@ class RemoteBackup typedef std::map<QueuePtr, GuardPtr> GuardMap; typedef std::set<QueuePtr> QueueSet; - /** Add queue to guard as an initial queue */ - void initialQueue(const QueuePtr&, bool createGuard); + void catchupQueue(const QueuePtr&, bool createGuard); std::string logPrefix; BrokerInfo brokerInfo; ReplicationTest replicationTest; GuardMap guards; - QueueSet initialQueues; - bool connected; + QueueSet catchupQueues; + broker::Connection* connection; bool reportedReady; }; |