From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18536 invoked by alias); 27 Mar 2009 19:16:41 -0000 Received: (qmail 18521 invoked by alias); 27 Mar 2009 19:16:39 -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 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: c062d7a1a908bdd35f9b7dfd2fdf67f7600dcc9e X-Git-Newrev: 5107d461e84ab84a05e8f0c34bf91b0ef36951b5 From: "Fabio M. Di Nitto" Message-Id: <20090327190649.AF3E312020C@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/msg00966.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5107d461e84ab84a05e8f0c34bf91b0ef36951b5 Commit: 5107d461e84ab84a05e8f0c34bf91b0ef36951b5 Parent: c062d7a1a908bdd35f9b7dfd2fdf67f7600dcc9e Author: Fabio M. Di Nitto AuthorDate: Thu Mar 26 11:51:27 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Mar 27 20:05:46 2009 +0100 cman init: clean up status check check daemons in the right order Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 09e0580..cdb3a24 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -699,6 +699,13 @@ stop() cmanstatus() { + errmsg=$( status corosync 2>&1 ) || return 1 + cman_running || return 1 + + if qdiskd_enabled; then + errmsg=$( status qdiskd 2>&1) || return 1 + fi + if groupd_enabled; then errmsg=$( status groupd 2>&1) || return 1 fi @@ -711,12 +718,6 @@ cmanstatus() errmsg=$( status cmannotifyd 2>&1) || return 1 fi - if qdiskd_enabled; then - errmsg=$( status qdiskd 2>&1) || return 1 - fi - - errmsg=$( status corosync 2>&1) || return 1 - if fence_xvmd_enabled; then errmsg=$( status fence_xvmd 2>&1) || return 1 fi