From mboxrd@z Thu Jan  1 00:00:00 1970
From: lhh@sourceware.org <lhh@sourceware.org>
Date: 25 Jan 2008 18:13:24 -0000
Subject: [Cluster-devel] cluster/cman/qdisk main.c
Message-ID: <20080125181324.28459.qmail@sourceware.org>
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

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2008-01-25 18:13:24

Modified files:
	cman/qdisk     : main.c 

Log message:
	Fix qdiskd master abdication logic (#430264)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/main.c.diff?cvsroot=cluster&r1=1.12&r2=1.13

--- cluster/cman/qdisk/main.c	2007/11/15 04:14:15	1.12
+++ cluster/cman/qdisk/main.c	2008/01/25 18:13:24	1.13
@@ -932,7 +932,8 @@
 		ctx->qc_master = master_exists(ctx, ni, max, &low_id, &count);
 
 		/* Resolve master conflict, if one exists */
-		if (count > 1 && ctx->qc_status == S_MASTER) {
+		if (count >= 1 && ctx->qc_status == S_MASTER &&
+		    ctx->qc_master != ctx->qc_my_id) {
 			clulog(LOG_WARNING, "Master conflict: abdicating\n");
 
 			/* Handle just like a recent upgrade */