diff options
| author | Gordon Sim <gsim@apache.org> | 2009-03-09 15:58:17 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2009-03-09 15:58:17 +0000 |
| commit | 1214783620f81f2b0b1e69c4c4df874d58cdf85b (patch) | |
| tree | 354f0767a8b113278cb3d5f8208ee8769fe56bac /cpp/src/qpid/cluster | |
| parent | 8f0e57d62c16d4723e6202127490ec12473e24d0 (diff) | |
| download | qpid-python-1214783620f81f2b0b1e69c4c4df874d58cdf85b.tar.gz | |
QPID-1721: Fixes for replication between clusters when new members are added
* suppress event generation during node catch up
* ensure sequence counters used for duplicate detection are synchronised in both primary and dr clusters when new members join
* connect queue with the event manager within queue registry rather than adapter as the latter path is not used for catchup
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@751719 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 169d0fb1af..126247e458 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -358,6 +358,7 @@ void Cluster::setReady(Lock&) { state = READY; if (mgmtObject!=0) mgmtObject->set_status("ACTIVE"); mcast.release(); + broker.getQueueEvents().enable(); } void Cluster::configChange(const MemberId&, const std::string& addresses, Lock& l) { @@ -385,8 +386,9 @@ void Cluster::configChange(const MemberId&, const std::string& addresses, Lock& elders = map.getAlive(); elders.erase(self); broker.getLinks().setPassive(true); + broker.getQueueEvents().disable(); } - } + } else if (state >= CATCHUP && memberChange) { memberUpdate(l); elders = ClusterMap::intersection(elders, map.getAlive()); |