From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6716 invoked by alias); 30 Jun 2009 10:13:24 -0000 Received: (qmail 6710 invoked by alias); 30 Jun 2009 10:13:24 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 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 bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman init: readd support for fence_xvmd standalone operations 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: 87076cf3354bdacdabe9fddf9b43b6080e33bca0 X-Git-Newrev: 8bd2da7c40ffc74f8ec8c0d0026b1ae1936611c1 From: "Fabio M. Di Nitto" Message-Id: <20090630101256.D272A120383@lists.fedorahosted.org> Date: Tue, 30 Jun 2009 10:13: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-q2/txt/msg00798.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8bd2da7c40ffc74f8ec8c0d0026b1ae1936611c1 Commit: 8bd2da7c40ffc74f8ec8c0d0026b1ae1936611c1 Parent: 87076cf3354bdacdabe9fddf9b43b6080e33bca0 Author: Fabio M. Di Nitto AuthorDate: Tue Jun 30 12:12:20 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Jun 30 12:12:20 2009 +0200 cman init: readd support for fence_xvmd standalone operations for some reason this patch was lost. Readd it. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 7e55705..e48300d 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -640,6 +640,12 @@ start() echo $echoarg "Starting cluster: " + runwrap start_fence_xvmd \ + fence_xvmd_standalone \ + "Starting virtual machine fencing host (standalone)" + + fence_xvmd_standalone && exit 0 + runwrap start_global \ none \ "Global setup" @@ -710,6 +716,12 @@ stop() echo $echoarg "Stopping cluster: " runwrap stop_fence_xvmd \ + fence_xvmd_standalone \ + "Stopping virtual machine fencing host (standalone)" + + fence_xvmd_standalone && exit 0 + + runwrap stop_fence_xvmd \ fence_xvmd_enabled \ "Stopping virtual machine fencing host" @@ -756,6 +768,11 @@ stop() cmanstatus() { + if fence_xvmd_standalone; then + errmsg=$( status fence_xvmd 2>&1 ) || return 1 + return 0 + fi + errmsg=$( status corosync 2>&1 ) || return 1 if ! cman_running; then @@ -810,7 +827,11 @@ restart|reload) ;; status) if cmanstatus; then - echo "cluster is running." + if fence_xvmd_standalone; then + echo "fence_xvmd standalone is running." + else + echo "cluster is running." + fi else echo $errmsg rtrn=1