From mboxrd@z Thu Jan  1 00:00:00 1970
From: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Thu, 06 Jan 2011 11:37:47 +0100
Subject: [Cluster-devel] [PATCH] Cman: test that corosync is not already
 running
In-Reply-To: <1294309722-6131-1-git-send-email-fdinitto@redhat.com>
References: <1294309722-6131-1-git-send-email-fdinitto@redhat.com>
Message-ID: <4D259B7B.9090906@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Re-iterating the patch for ACK to go in RHEL6.

Fabio

On 1/6/2011 11:28 AM, Fabio M. Di Nitto wrote:
> From: Jan Friesse <jfriesse@redhat.com>
> 
> Patch fixes init file so now before cman start is tested, if corosync is
> running. If so, init script will refuse to start.
> 
> Resolves: rhbz#617234
> ---
>  cman/init.d/cman.in |   14 ++++++++++++++
>  1 files changed, 14 insertions(+), 0 deletions(-)
> 
> diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
> index 7dae24d..6dfc119 100644
> --- a/cman/init.d/cman.in
> +++ b/cman/init.d/cman.in
> @@ -521,11 +521,25 @@ stop_configfs()
>  	fi
>  }
>  
> +corosync_running()
> +{
> +	[ -f /var/run/corosync.pid ] || return 1
> +
> +	read corosync_pid foo < /var/run/corosync.pid
> +	if [ "$(pidof corosync)" == "$corosync_pid" ];then
> +		errmsg="Corosync Cluster Engine is already running"
> +		return 0
> +	fi
> +
> +	return 1
> +}
> +
>  start_cman()
>  {
>  	check_exec cman_tool || return $?
>  	cman_running && return 0
>  	cman_checkconfig || return 1
> +	corosync_running && return 1
>  
>  	tmpfile=$(mktemp -t cmanstartup.XXXXXXXXXX)
>  	if [ -z "$tmpfile" ]; then