From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6529 invoked by alias); 27 Mar 2009 19:07:47 -0000 Received: (qmail 6522 invoked by alias); 27 Mar 2009 19:07:47 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman init: better handle of unfencing To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 593b15a97d1ab93cbd8cc6c7ee8e21ab21ffed1e X-Git-Newrev: 023e19c9c77074ca2709560e1ff0d0108a06a075 From: "Fabio M. Di Nitto" Message-Id: <20090327190717.D503512020C@lists.fedorahosted.org> Date: Fri, 27 Mar 2009 19:07: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: 2009-q1/txt/msg00955.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=023e19c9c77074ca2709560e1ff0d0108a06a075 Commit: 023e19c9c77074ca2709560e1ff0d0108a06a075 Parent: 593b15a97d1ab93cbd8cc6c7ee8e21ab21ffed1e Author: Fabio M. Di Nitto AuthorDate: Fri Mar 27 09:11:01 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Mar 27 20:05:47 2009 +0100 cman init: better handle of unfencing make it clear what we expect and how to handle it. handle also other situations like fence_node segfaulting. Origin problem reported by Jim Meyering. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 91cb62c..5afb6ce 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -461,9 +461,15 @@ stop_cman() unfence_self() { + # fence_node returns 0 on success, 1 on failure, 2 if unconfigured + # 0 and 2 are ok. Everything else should report error. fence_node -U > /dev/null 2>&1 - [ $? -eq 1 ] && return 1 - return 0 + case $? in + 0|2) + return 0 + ;; + esac + return 1 } start_qdiskd()