You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2012/07/10 22:07:17 UTC
svn commit: r1359879 - in /qpid/trunk/qpid/cpp/src/qpid/ha: Backup.cpp
HaBroker.cpp
Author: aconway
Date: Tue Jul 10 20:07:16 2012
New Revision: 1359879
URL: http://svn.apache.org/viewvc?rev=1359879&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/cpp/src/qpid/ha/Backup.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/Backup.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/Backup.cpp?rev=1359879&r1=1359878&r2=1359879&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/Backup.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/Backup.cpp Tue Jul 10 20:07:16 2012
@@ -82,7 +82,7 @@ void Backup::initialize(const Url& broke
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;
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp?rev=1359879&r1=1359878&r2=1359879&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp Tue Jul 10 20:07:16 2012
@@ -175,7 +175,8 @@ Manageable::status_t HaBroker::Managemen
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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org