From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19221 invoked by alias); 27 Mar 2009 19:16:44 -0000 Received: (qmail 19212 invoked by alias); 27 Mar 2009 19:16:44 -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: clean up status check a bit more 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: c28af633d98166d3349f3f1163c18bccb514d2b1 X-Git-Newrev: 7d1e5164ddb83d3fa872fab61f32a9d40cbf777e From: "Fabio M. Di Nitto" Message-Id: <20090327190654.5EA6512020C@lists.fedorahosted.org> Date: Fri, 27 Mar 2009 19:16: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/msg00967.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7d1e5164ddb83d3fa872fab61f32a9d40cbf777e Commit: 7d1e5164ddb83d3fa872fab61f32a9d40cbf777e Parent: c28af633d98166d3349f3f1163c18bccb514d2b1 Author: Fabio M. Di Nitto AuthorDate: Thu Mar 26 11:57:23 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Mar 27 20:05:46 2009 +0100 cman init: clean up status check a bit more also make cman_running check more useful Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 52709f4..65e02aa 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -700,26 +700,30 @@ stop() cmanstatus() { errmsg=$( status corosync 2>&1 ) || return 1 - cman_running || return 1 + + if ! cman_running; then + errmsg="cman is not running" + return 1 + fi if qdiskd_enabled; then - errmsg=$( status qdiskd 2>&1) || return 1 + errmsg=$( status qdiskd 2>&1 ) || return 1 fi if groupd_enabled; then - errmsg=$( status groupd 2>&1) || return 1 + errmsg=$( status groupd 2>&1 ) || return 1 fi - 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 fenced 2>&1 ) || return 1 + errmsg=$( status dlm_controld 2>&1 ) || return 1 + errmsg=$( status gfs_controld 2>&1 ) || return 1 if cmannotifyd_enabled; then - errmsg=$( status cmannotifyd 2>&1) || return 1 + errmsg=$( status cmannotifyd 2>&1 ) || return 1 fi if fence_xvmd_enabled; then - errmsg=$( status fence_xvmd 2>&1) || return 1 + errmsg=$( status fence_xvmd 2>&1 ) || return 1 fi return 0