QPID-3603: Improvements to HA log messages, clarify primary/backp role.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1349543 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 6 insertions, 5 deletions

diff --git a/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp b/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
index d121aa1191..9c35daee22 100644
--- a/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
+++ b/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
@@ -62,7 +62,7 @@ void ConnectionObserver::opened(broker::Connection& connection) {
     BrokerInfo info;            // Avoid self connections.
     if (getBrokerInfo(connection, info)) {
         if (info.getSystemId() == self)
-            throw Exception("HA rejected self connection");
+            throw Exception(QPID_MSG(logPrefix << "Rejected connection from self"));
     }
     ObserverPtr o(getObserver());
     if (o) o->opened(connection);
diff --git a/qpid/cpp/src/qpid/ha/QueueGuard.cpp b/qpid/cpp/src/qpid/ha/QueueGuard.cpp
index b330c4b9cc..88244f2c87 100644
--- a/qpid/cpp/src/qpid/ha/QueueGuard.cpp
+++ b/qpid/cpp/src/qpid/ha/QueueGuard.cpp
@@ -51,7 +51,7 @@ QueueGuard::QueueGuard(broker::Queue& q, const BrokerInfo& info)
 {
     // Set a log prefix message that identifies the remote broker.
     std::ostringstream os;
-    os << "HA guard " << queue.getName() << "@" << info.getLogId() << ": ";
+    os << "HA primary guard " << queue.getName() << "@" << info.getLogId() << ": ";
     logPrefix = os.str();
     observer.reset(new QueueObserver(*this));
     queue.addObserver(observer);
@@ -63,7 +63,7 @@ QueueGuard::~QueueGuard() { cancel(); }
 void QueueGuard::enqueued(const QueuedMessage& qm) {
     assert(qm.queue == &queue);
     // Delay completion
-    QPID_LOG(trace, logPrefix << "Delaying completion of " << qm);
+    QPID_LOG(trace, logPrefix << "Delayed completion of " << qm);
     qm.payload->getIngressCompletion().startCompleter();
     {
         sys::Mutex::ScopedLock l(lock);
diff --git a/qpid/cpp/src/qpid/ha/QueueReplicator.cpp b/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
index efa45ff58c..7c65ea3522 100644
--- a/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
@@ -159,6 +159,7 @@ void QueueReplicator::route(Deliverable& msg)
         sys::Mutex::ScopedLock l(lock);
         if (!isEventKey(key)) {
             msg.deliverTo(queue);
+            // FIXME aconway 2012-06-10: race, position may have moved
             QPID_LOG(trace, logPrefix << "Enqueued message " << queue->getPosition());
         }
         else if (key == DEQUEUE_EVENT_KEY) {
diff --git a/qpid/cpp/src/qpid/ha/RemoteBackup.cpp b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
index 94e60d7ed8..42861b1e78 100644
--- a/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
+++ b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
@@ -32,7 +32,7 @@ using sys::Mutex;
 
 RemoteBackup::RemoteBackup(
     const BrokerInfo& info, broker::Broker& broker, ReplicationTest rt) :
-    logPrefix("HA backup "+info.getLogId()+": "), brokerInfo(info), replicationTest(rt)
+    logPrefix("HA primary, backup to "+info.getLogId()+": "), brokerInfo(info), replicationTest(rt)
 {
     QPID_LOG(debug, logPrefix << "Guarding queues for backup broker. ");
     broker.getQueues().eachQueue(boost::bind(&RemoteBackup::initialQueue, this, _1));
diff --git a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
index ebc2365664..c74abb6cdd 100644
--- a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
+++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
@@ -197,7 +197,7 @@ ReplicatingSubscription::ReplicatingSubscription(
 
         // Set a log prefix message that identifies the remote broker.
         ostringstream os;
-        os << "HA subscription " << queue->getName() << "@" << info.getLogId() << ": ";
+        os << "HA primary replicate " << queue->getName() << "@" << info.getLogId() << ": ";
         logPrefix = os.str();
 
         QueueRange primary(*queue);