From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29996 invoked by alias); 1 Aug 2008 09:17:07 -0000 Received: (qmail 29990 invoked by alias); 1 Aug 2008 09:17:05 -0000 X-Spam-Status: No, hits=-0.7 required=5.0 tests=AWL,BAYES_05,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: master - cman: Revert dirty patch To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: c91f6ca13c5b67b9b111c50d4455fe0110b52274 X-Git-Newrev: e5885fd588a0608ddf00ad03ee3289a1b0c9f656 From: Christine Caulfield Message-Id: <20080801091612.66756A8256@lists.fedorahosted.org> Date: Fri, 01 Aug 2008 09:25:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00199.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e5885fd588a0608ddf00ad03ee3289a1b0c9f656 Commit: e5885fd588a0608ddf00ad03ee3289a1b0c9f656 Parent: c91f6ca13c5b67b9b111c50d4455fe0110b52274 Author: Christine Caulfield AuthorDate: Fri Aug 1 10:14:31 2008 +0100 Committer: Christine Caulfield CommitterDate: Fri Aug 1 10:14:31 2008 +0100 cman: Revert dirty patch Revert patch 288ab73e51f51ce174f51dc2fc67c6dd1fe03e85 as it's dangerously wrong and based on several misunderstandings. see bz#443358 for mroe information Signed-off-by: Christine Caulfield --- cman/daemon/commands.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c index c37d38b..d814d76 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -1778,8 +1778,7 @@ static void do_process_transition(int nodeid, char *data, int len) /* Newer nodes 6.1.0 onwards, set the DIRTY flag if they have state. If the new node has been down and has state then we mark it disallowed because we cannot merge stateful nodes */ - if (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN || - (us->flags & NODE_FLAGS_DIRTY && nodeid != us->node_id))) { + if (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) { /* Don't duplicate messages */ if (node->state != NODESTATE_AISONLY) { if (cluster_is_quorate) {