diff options
author | Alan Conway <aconway@apache.org> | 2014-04-07 15:39:19 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2014-04-07 15:39:19 +0000 |
commit | 8b0808b498dd5e3fe5e5d04e9e9c9492206036e2 (patch) | |
tree | 67583f2b579d2af50ca57184c047b556c4103a46 /qpid/cpp/src/qpid/ha/Primary.cpp | |
parent | 819e51ed19cb6f193d55a7894ca68c7131f00f07 (diff) | |
download | qpid-python-8b0808b498dd5e3fe5e5d04e9e9c9492206036e2.tar.gz |
QPID-5666: HA fails with resource-limit-exceeded: Exceeded replicated queue limit
This is regression introduced in r1561206: CommitDate: Fri Jan 24 21:54:59 2014 +0000
QPID-5513: HA backup fails if number of replicated queues exceeds number of channels.
Fixed by the current commit. PrimaryQueueLimits was not taking account of queues already
on the broker prior to promotion.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585507 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/ha/Primary.cpp')
-rw-r--r-- | qpid/cpp/src/qpid/ha/Primary.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp index b4d50d1652..af4ae12177 100644 --- a/qpid/cpp/src/qpid/ha/Primary.cpp +++ b/qpid/cpp/src/qpid/ha/Primary.cpp @@ -136,7 +136,7 @@ Primary::Primary(HaBroker& hb, const BrokerInfo::Set& expect) : logPrefix("Primary: "), active(false), replicationTest(hb.getSettings().replicateDefault.get()), sessionHandlerObserver(new PrimarySessionHandlerObserver(logPrefix)), - queueLimits(logPrefix) + queueLimits(logPrefix, hb.getBroker().getQueues(), replicationTest) { // Note that at this point, we are still rejecting client connections. // So we are safe from client interference while we set up the primary. |