Author: aconway
Date: Fri Jun 22 20:07:19 2012
New Revision: 1353017
URL: http://svn.apache.org/viewvc?rev=1353017&view=rev
Log:
NO-JIRA: Trivial code cleanup, removing outdated FIXME comments.
Removed:
qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryConnectionMonitor.h
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/ha.mk
qpid/trunk/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h
qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1353017&r1=1353016&r2=1353017&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Jun 22 20:07:19 2012
@@ -647,7 +647,6 @@ if (BUILD_HA)
qpid/ha/Membership.h
qpid/ha/Primary.cpp
qpid/ha/Primary.h
- qpid/ha/PrimaryConnectionMonitor.h
qpid/ha/QueueRange.h
qpid/ha/QueueReplicator.cpp
qpid/ha/QueueReplicator.h
Modified: qpid/trunk/qpid/cpp/src/ha.mk
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/ha.mk?rev=1353017&r1=1353016&r2=1353017&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/ha.mk (original)
+++ qpid/trunk/qpid/cpp/src/ha.mk Fri Jun 22 20:07:19 2012
@@ -40,7 +40,6 @@ ha_la_SOURCES = \
qpid/ha/Membership.h \
qpid/ha/Primary.cpp \
qpid/ha/Primary.h \
- qpid/ha/PrimaryConnectionMonitor.h \
qpid/ha/QueueGuard.cpp \
qpid/ha/QueueGuard.h \
qpid/ha/QueueRange.h \
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h?rev=1353017&r1=1353016&r2=1353017&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h Fri Jun 22
20:07:19 2012
@@ -28,7 +28,6 @@
namespace qpid {
namespace ha {
-// FIXME aconway 2012-06-06: move to Backup.cpp
/**
* Exclude connections to a backup broker.
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp?rev=1353017&r1=1353016&r2=1353017&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp Fri Jun 22 20:07:19
2012
@@ -198,8 +198,7 @@ void BrokerReplicator::initialize() {
);
}
-// FIXME aconway 2012-05-07: reference cycled between Link and
BrokerReplicator.
-BrokerReplicator::~BrokerReplicator() { link->close(); }
+BrokerReplicator::~BrokerReplicator() { }
// This is called in the connection IO thread when the bridge is started.
void BrokerReplicator::initializeBridge(Bridge& bridge, SessionHandler&
sessionHandler) {
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp?rev=1353017&r1=1353016&r2=1353017&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp Fri Jun 22 20:07:19
2012
@@ -32,7 +32,6 @@ namespace ha {
ConnectionObserver::ConnectionObserver(HaBroker& hb, const types::Uuid& uuid)
: haBroker(hb), logPrefix("Connections: "), self(uuid) {}
-// FIXME aconway 2012-06-06: move to BrokerInfo
bool ConnectionObserver::getBrokerInfo(broker::Connection& connection,
BrokerInfo& info) {
framing::FieldTable ft;
if
(connection.getClientProperties().getTable(ConnectionObserver::BACKUP_TAG, ft))
{
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp?rev=1353017&r1=1353016&r2=1353017&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp Fri Jun 22 20:07:19 2012
@@ -160,7 +160,7 @@ void QueueReplicator::route(Deliverable&
sys::Mutex::ScopedLock l(lock);
if (!isEventKey(key)) {
msg.deliverTo(queue);
- // FIXME aconway 2012-06-10: race, position may have moved
+ // We are on a backup so the queue is not modified except via this.
QPID_LOG(trace, logPrefix << "Enqueued message " <<
queue->getPosition());
}
else if (key == DEQUEUE_EVENT_KEY) {
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp?rev=1353017&r1=1353016&r2=1353017&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp Fri Jun 22 20:07:19 2012
@@ -36,7 +36,6 @@ RemoteBackup::RemoteBackup(
createGuards(cg)
{
QPID_LOG(debug, logPrefix << "Guarding queues for backup broker.");
- // FIXME aconway 2012-06-12: potential deadlocks, this is called inside
ConnectionObserver::opened.
broker.getQueues().eachQueue(boost::bind(&RemoteBackup::initialQueue,
this, _1));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
