From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7498 invoked by alias); 20 Mar 2009 05:47:57 -0000 Received: (qmail 7487 invoked by alias); 20 Mar 2009 05:47:57 -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: master - init: fix status check 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: 7016cb1fba9926d4a0b3a2527c0cfa0541e97f08 X-Git-Newrev: fbc2fb7ed43fbfad24cc751555dbbde5a5642389 From: "Fabio M. Di Nitto" Message-Id: <20090320054737.4946B1202F9@lists.fedorahosted.org> Date: Fri, 20 Mar 2009 05:47: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/msg00838.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=fbc2fb7ed43fbfad24cc751555dbbde5a5642389 Commit: fbc2fb7ed43fbfad24cc751555dbbde5a5642389 Parent: 7016cb1fba9926d4a0b3a2527c0cfa0541e97f08 Author: Fabio M. Di Nitto AuthorDate: Fri Mar 20 06:29:02 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Mar 20 06:47:02 2009 +0100 init: fix status check make sure to handle conditional startups properly and add qdisk check. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 816a204..b4af24c 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -697,7 +697,26 @@ cmanstatus() errmsg=$( status fenced 2>&1) || return 1 errmsg=$( status dlm_controld 2>&1) || return 1 errmsg=$( status gfs_controld 2>&1) || return 1 - errmsg=$( status cmannotifyd 2>&1) || return 1 + + case "$CMAN_NOTIFYD_START" in + yes) + errmsg=$( status cmannotifyd 2>&1) || return 1 + ;; + no) + # nothing to do + ;; + conditional) + if [ -n "$(ls -1 @NOTIFYDDIR@ 2>/dev/null)" ]; then + errmsg=$( status cmannotifyd 2>&1) || return 1 + fi + ;; + esac + + if ccs_tool query /cluster/quorumd >/dev/null 2>&1; then + errmsg=$( status qdiskd 2>&1) || return 1 + fi + + errmsg=$( status corosync 2>&1) || return 1 fence_xvmd_enabled || return 0 errmsg=$( status fence_xvmd 2>&1) || return 1