diff options
| author | Alan Conway <aconway@apache.org> | 2009-07-10 15:42:36 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-07-10 15:42:36 +0000 |
| commit | 82d0880a9a9a65029d35422ad2dff675b867bb6c (patch) | |
| tree | b974a2a89e13000cd9ff680b05a74df7bcf09ea5 /cpp/src/qpid/cluster/Cluster.cpp | |
| parent | 072ce948be1894a1fbaccf4accb0eb9788275bd9 (diff) | |
| download | qpid-python-82d0880a9a9a65029d35422ad2dff675b867bb6c.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/cluster/Cluster.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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. |