From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10741 invoked by alias); 9 May 2008 21:03:08 -0000 Received: (qmail 10711 invoked by uid 9453); 9 May 2008 21:03:07 -0000 Date: Fri, 09 May 2008 21:03:00 -0000 Message-ID: <20080509210307.10696.qmail@sourceware.org> From: teigland@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.00-33-g74b2b54 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3c3e0dd3dbca52c6edb5ce86d7de2ab09556e838 X-Git-Newrev: 74b2b54ae2388692c4cd3c05012dc47d1436a3fa 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-q2/txt/msg00281.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=74b2b54ae2388692c4cd3c05012dc47d1436a3fa The branch, master has been updated via 74b2b54ae2388692c4cd3c05012dc47d1436a3fa (commit) from 3c3e0dd3dbca52c6edb5ce86d7de2ab09556e838 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 74b2b54ae2388692c4cd3c05012dc47d1436a3fa Author: David Teigland Date: Fri May 9 16:01:33 2008 -0500 dlm_controld: fix waiting for removed node When a node is removed by leaving (not failing), don't wait for it to be removed by cman/quorum, since it won't be. Signed-off-by: David Teigland ----------------------------------------------------------------------- Summary of changes: group/dlm_controld/cpg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c index 1765a69..00c4ce6 100644 --- a/group/dlm_controld/cpg.c +++ b/group/dlm_controld/cpg.c @@ -338,7 +338,6 @@ static void node_history_left(struct lockspace *ls, int nodeid, } node->add_time = 0; - node->check_quorum = 1; node->removed_seq = cg->seq; /* for queries */ } @@ -411,7 +410,7 @@ static int check_fencing_done(struct lockspace *ls) return 1; } -/* wait for cman to see all the same nodes removed, and to say there's quorum */ +/* wait for cman to see all the same nodes failed, and to say there's quorum */ static int check_quorum_done(struct lockspace *ls) { hooks/post-receive -- Cluster Project