diff options
| author | Alan Conway <aconway@apache.org> | 2012-07-11 15:26:36 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-07-11 15:26:36 +0000 |
| commit | 9c3bf9ea296f7fff955440aac00a578f55a24c0f (patch) | |
| tree | 3abe56f20d689675be96fc193a3e7d505f602e36 | |
| parent | eb16524f0a84674378e66ceadbd30f5994d8da65 (diff) | |
| download | qpid-python-9c3bf9ea296f7fff955440aac00a578f55a24c0f.tar.gz | |
QPID-4128: HA should not use amq.failover for replication links
HA replication links should not use the amq.failover exchange to get updates
reconnect targets. amq.failover provides the client failover list, HA manages a
separate failover list for brokers. Replication links should be using the broker
list, and not allow it to be overwritten by amq.failover updates.
Review requested for 0.18, 2 line fix.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1360228 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/ha/Backup.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/ha/HaBroker.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/ha/Backup.cpp b/qpid/cpp/src/qpid/ha/Backup.cpp index 8ffe411c91..4ec8af588c 100644 --- a/qpid/cpp/src/qpid/ha/Backup.cpp +++ b/qpid/cpp/src/qpid/ha/Backup.cpp @@ -82,7 +82,7 @@ void Backup::initialize(const Url& brokers) { url[0].host, url[0].port, protocol, false, // durable settings.mechanism, settings.username, settings.password, - true); // amq.failover + false); // no amq.failover - don't want to use client URL. { sys::Mutex::ScopedLock l(lock); link = result.first; diff --git a/qpid/cpp/src/qpid/ha/HaBroker.cpp b/qpid/cpp/src/qpid/ha/HaBroker.cpp index 1728ed6858..858f04e198 100644 --- a/qpid/cpp/src/qpid/ha/HaBroker.cpp +++ b/qpid/cpp/src/qpid/ha/HaBroker.cpp @@ -175,7 +175,8 @@ Manageable::status_t HaBroker::ManagementMethod (uint32_t methodId, Args& args, broker::QPID_NAME_PREFIX + string("ha.link.") + uuid.str(), url[0].host, url[0].port, protocol, false, // durable - settings.mechanism, settings.username, settings.password); + settings.mechanism, settings.username, settings.password, + false); // no amq.failover - don't want to use client URL. boost::shared_ptr<broker::Link> link = result.first; link->setUrl(url); // Create a queue replicator |