diff options
| author | Alan Conway <aconway@apache.org> | 2012-05-28 18:24:14 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-05-28 18:24:14 +0000 |
| commit | 20e2657ada6e11d4af86dd754e15e590520ed197 (patch) | |
| tree | 1fed3df469339e6876649cb4ef5f0d586b3f8fdc /qpid/cpp | |
| parent | b81ca39d3cfbb1622a68fd2ddb86b883910a5229 (diff) | |
| download | qpid-python-20e2657ada6e11d4af86dd754e15e590520ed197.tar.gz | |
QPID-3603: Close replication link when a backup broker is promoted to primary.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1343348 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/ha/HaBroker.cpp | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/ha/HaBroker.cpp b/qpid/cpp/src/qpid/ha/HaBroker.cpp index 1d2a1bc8d1..32261c560d 100644 --- a/qpid/cpp/src/qpid/ha/HaBroker.cpp +++ b/qpid/cpp/src/qpid/ha/HaBroker.cpp @@ -106,6 +106,7 @@ void HaBroker::activate() { void HaBroker::activate(sys::Mutex::ScopedLock&) { setStatus(ACTIVE); + backup.reset(); // No longer replicating, close link. broker.getConnectionObservers().remove(excluder); // This allows client connections. } diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index 257ac68b74..1b93504b64 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/cpp/src/tests/brokertest.py @@ -659,7 +659,7 @@ class NumberedReceiver(Thread): m = self.read_message() while m != -1: self.receiver.assert_running() - assert(m <= self.received) # Check for missing messages + assert m <= self.received, "Missing message %s>%s"%(m, self.received) if (m == self.received): # Ignore duplicates self.received += 1 if self.sender: |