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 2013/02/08 20:35:01 UTC
svn commit: r1444200 - in /qpid/trunk/qpid/cpp/src/qpid:
broker/QueueSettings.cpp broker/QueueSettings.h broker/SessionAdapter.cpp
ha/ReplicationTest.cpp
Author: aconway
Date: Fri Feb 8 19:35:01 2013
New Revision: 1444200
URL: http://svn.apache.org/r1444200
Log:
QPID-4555: HA Replace QueueSettings::declaredExclusive with isTemporary.
Minor reorganization to make things clearer. It was not at all obvious what
declaredExclusive mean, isTemporary makes more sense (suggested by gsim
https://reviews.apache.org/r/9258/)
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.h
qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/ReplicationTest.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.cpp?rev=1444200&r1=1444199&r2=1444200&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.cpp Fri Feb 8 19:35:01 2013
@@ -77,7 +77,7 @@ const QueueSettings::Aliases QueueSettin
QueueSettings::QueueSettings(bool d, bool a) :
durable(d),
autodelete(a),
- declaredExclusive(false),
+ isTemporary(false),
priorities(0),
defaultFairshare(0),
shareGroups(false),
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.h?rev=1444200&r1=1444199&r2=1444200&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueSettings.h Fri Feb 8 19:35:01 2013
@@ -43,7 +43,7 @@ struct QueueSettings
bool durable;
bool autodelete;
- bool declaredExclusive;
+ bool isTemporary;
//basic queue types:
std::string lvqKey;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp?rev=1444200&r1=1444199&r2=1444200&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp Fri Feb 8 19:35:01 2013
@@ -294,7 +294,8 @@ void SessionAdapter::QueueHandlerImpl::d
} catch (const qpid::types::Exception& e) {
throw InvalidArgumentException(e.what());
}
- settings.declaredExclusive = exclusive;
+ // Identify queues that won't survive a failover.
+ settings.isTemporary = exclusive && autoDelete && !settings.autoDeleteDelay;
std::pair<Queue::shared_ptr, bool> queue_created =
getBroker().createQueue(name, settings,
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/ReplicationTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/ReplicationTest.cpp?rev=1444200&r1=1444199&r2=1444200&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/ReplicationTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/ReplicationTest.cpp Fri Feb 8 19:35:01 2013
@@ -65,9 +65,7 @@ ReplicateLevel ReplicationTest::getLevel
ReplicateLevel ReplicationTest::useLevel(const broker::Queue& q)
{
- bool ignore = q.isAutoDelete() && q.getSettings().declaredExclusive &&
- !q.getSettings().autoDeleteDelay;
- return ignore ? ReplicationTest(NONE).getLevel(q) : getLevel(q);
+ return q.getSettings().isTemporary ? ReplicationTest(NONE).getLevel(q) : getLevel(q);
}
ReplicateLevel ReplicationTest::useLevel(const broker::Exchange& ex) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org