From 82d0880a9a9a65029d35422ad2dff675b867bb6c Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 10 Jul 2009 15:42:36 +0000 Subject: Fix cluster handling of multiple errors. If an error occured while there were frames on the error queue from a previous error, the enqueued frames were not being processed for the new error, which could lead to error-check or config-change frames being missed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@792991 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/Cluster.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/cluster/Cluster.cpp') diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 1984b4f4df..92859cc641 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -440,7 +440,7 @@ void Cluster::processFrame(const EventFrame& e, Lock& l) { connection->deliveredFrame(e); } else - QPID_LOG(critical, *this << " FIXME DROP (no connection): " << e); + QPID_LOG(debug, *this << " DROP (no connection): " << e); } else // Drop connection frames while state < CATCHUP QPID_LOG(trace, *this << " DROP (joining): " << e); @@ -534,6 +534,7 @@ void Cluster::setReady(Lock&) { void Cluster::configChange(const MemberId&, const std::string& current, Lock& l) { bool memberChange = map.configChange(current); + QPID_LOG(debug, *this << " applied config change: " << map); if (state == LEFT) return; if (!map.isAlive(self)) { // Final config change. -- cgit v1.2.1