diff options
author | Alan Conway <aconway@apache.org> | 2016-06-27 21:55:53 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2016-06-27 21:55:53 +0000 |
commit | 13525713a1f57c4228982c79029f7a5486ced0e7 (patch) | |
tree | d52531e9d42fd394fd86510ff0b9071bdfd72ec3 | |
parent | 122793f90e90b228d30af83e4c0ced3ad41cdec4 (diff) | |
download | qpid-python-13525713a1f57c4228982c79029f7a5486ced0e7.tar.gz |
QPID-7326: Memory bloat on HA primary broker
Removed left-over code that was keeping queues in an unused map.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1750417 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/cpp/src/qpid/ha/Primary.cpp | 7 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/ha/Primary.h | 4 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp | 2 |
3 files changed, 0 insertions, 13 deletions
diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp index ca92ad77dc..3a9c9a86d9 100644 --- a/qpid/cpp/src/qpid/ha/Primary.cpp +++ b/qpid/cpp/src/qpid/ha/Primary.cpp @@ -259,13 +259,6 @@ void Primary::readyReplica(const ReplicatingSubscription& rs) { if (backup) checkReady(backup); } -void Primary::addReplica(ReplicatingSubscription& rs) { - // Note this is called before the ReplicatingSubscription has been activated - // on the queue. - sys::Mutex::ScopedLock l(lock); - replicas[make_pair(rs.getBrokerInfo().getSystemId(), rs.getQueue())] = &rs; -} - // NOTE: Called with queue registry lock held. void Primary::queueCreate(const QueuePtr& q) { // Set replication argument. diff --git a/qpid/cpp/src/qpid/ha/Primary.h b/qpid/cpp/src/qpid/ha/Primary.h index 58e6e684ea..8ca36b35ac 100644 --- a/qpid/cpp/src/qpid/ha/Primary.h +++ b/qpid/cpp/src/qpid/ha/Primary.h @@ -83,7 +83,6 @@ class Primary : public Role void setBrokerUrl(const Url&) {} void readyReplica(const ReplicatingSubscription&); - void addReplica(ReplicatingSubscription&); // Called via BrokerObserver void queueCreate(const QueuePtr&); @@ -107,8 +106,6 @@ class Primary : public Role typedef std::set<RemoteBackupPtr > BackupSet; typedef std::pair<types::Uuid, boost::shared_ptr<broker::Queue> > UuidQueue; - typedef sys::unordered_map<UuidQueue, ReplicatingSubscription*, - Hasher<UuidQueue> > ReplicaMap; RemoteBackupPtr backupConnect(const BrokerInfo&, broker::Connection&, sys::Mutex::ScopedLock&); void backupDisconnect(RemoteBackupPtr, sys::Mutex::ScopedLock&); @@ -139,7 +136,6 @@ class Primary : public Role boost::shared_ptr<broker::BrokerObserver> brokerObserver; boost::shared_ptr<broker::SessionHandlerObserver> sessionHandlerObserver; boost::intrusive_ptr<sys::TimerTask> timerTask; - ReplicaMap replicas; PrimaryQueueLimits queueLimits; }; }} // namespace qpid::ha diff --git a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp index 8530413b35..64fdae121c 100644 --- a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp +++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp @@ -157,8 +157,6 @@ void ReplicatingSubscription::initialize() { << ", backup (keep " << skipEnqueue << ", drop " << initDequeues << ")"); checkReady(l); } - - if (primary) primary->addReplica(*this); Mutex::ScopedLock l(lock); // Note dequeued() can be called concurrently. // Send initial dequeues to the backup. // There must be a shared_ptr(this) when sending. |