From 317188a84b04b38c4c905ccd4c8b2fa9b8ae46b8 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 21 Jun 2012 16:05:09 +0000 Subject: QPID-4082: cluster de-sync after broker restart & queue replication Having queue state replication between 2 clusters, restarting a broker in both source+destination clusters sometimes leads to cluster de-sync. No QMF communication is involved, though symptoms are similar to the bug caused by missing propagation of QMF errors within a cluster. The bug is caused by "deliveryCount" in SemanticState::ConsumerImpl (qpid/broker/SemanticState.cpp) not being replicated to a joining cluster node during catch-up. When the elder broker in src.cluster sends session.sync() after sending 5 messages (per --ack 5 in qpid-route), the recently joiner node in src.cluster does not do so, what leads to the cluster de-sync. The patch: - adds to "consumer-state" method (see xml/cluster.xml file change) to update a new joi-ner a new property deliveryCount - updates cluster::Connection::consumerState to send deliveryCount to the method - updates cluster::Connection::consumerState to set the received deliveryCount - add two methods to broker::SemanticState::ConsumerImpl for getting and setting deliveryCount git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1352588 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/xml/cluster.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/cpp/xml') diff --git a/qpid/cpp/xml/cluster.xml b/qpid/cpp/xml/cluster.xml index f9b8caf185..09434ea37b 100644 --- a/qpid/cpp/xml/cluster.xml +++ b/qpid/cpp/xml/cluster.xml @@ -179,6 +179,7 @@ + -- cgit v1.2.1