From 740b9e005927fbb26b030a09dc25ee147c598da3 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 14 Jun 2012 00:47:39 +0000 Subject: QPID-3603: Bug fixes to HA code, passing test_failover_send_receive - Updated HA logging messages to conform to new [Category] log format. - QueueGuard fencepost error, set firstSafe correctly - ReplicatingSubscription passing correct broker info to getGuard() - Don't remove RemoteBackups on disconnect: fixes race where backup rejects connection but primary sees closed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1350069 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/ha/QueueGuard.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/ha/QueueGuard.cpp') diff --git a/cpp/src/qpid/ha/QueueGuard.cpp b/cpp/src/qpid/ha/QueueGuard.cpp index 40262a180c..93694af671 100644 --- a/cpp/src/qpid/ha/QueueGuard.cpp +++ b/cpp/src/qpid/ha/QueueGuard.cpp @@ -52,13 +52,13 @@ QueueGuard::QueueGuard(broker::Queue& q, const BrokerInfo& info) : queue(q), subscription(0) { std::ostringstream os; - os << "HA primary guard " << queue.getName() << "@" << info.getLogId() << ": "; + os << "Primary guard " << queue.getName() << "@" << info.getLogId() << ": "; logPrefix = os.str(); observer.reset(new QueueObserver(*this)); // Once we call addObserver we can get calls to enqueued and dequeued queue.addObserver(observer); // Must set after addObserver so we don't miss any enqueues. - firstSafe = queue.getPosition()+1; // Next message will be safe. + firstSafe = queue.getPosition(); // FIXME aconway 2012-06-13: fencepost error } QueueGuard::~QueueGuard() { cancel(); } -- cgit v1.2.1