From mboxrd@z Thu Jan  1 00:00:00 1970
From: Fabio M. Di Nitto <fabbione@fabbione.net>
Date: Thu, 06 Jan 2011 11:37:30 +0100
Subject: [Cluster-devel] [PATCH] Cman: Handle "another instance running"
 error code
In-Reply-To: <1294309704-6096-1-git-send-email-fdinitto@redhat.com>
References: <1294309704-6096-1-git-send-email-fdinitto@redhat.com>
Message-ID: <4D259B6A.3010102@fabbione.net>
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>
> 
> Related: rhbz#617247, rhbz#617234
> ---
>  cman/cman_tool/join.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/cman/cman_tool/join.c b/cman/cman_tool/join.c
> index 60460d5..caa5bf6 100644
> --- a/cman/cman_tool/join.c
> +++ b/cman/cman_tool/join.c
> @@ -85,6 +85,12 @@ static const char *corosync_exit_reason(signed char status)
>  	case 16:
>  		return "Required directory not present /var/lib/corosync.";
>  		break;
> +	case 17:
> +		return "Could not acquire lock";
> +		break;
> +	case 18:
> +		return "Another Corosync instance is already running";
> +		break;
>  	default:
>  		sprintf(reason, "Error, reason code is %d", status);
>  		return reason;