[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-6-gd5e690a

[lhh@sourceware.org <lhh@sourceware.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d5e690aa185be4fcaa411f82016c59921a729e5e

The branch, RHEL5 has been updated
       via  d5e690aa185be4fcaa411f82016c59921a729e5e (commit)
      from  a02dfd2bcbe018c550ea04895ba4335da8dff4b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d5e690aa185be4fcaa411f82016c59921a729e5e
Author: Lon Hohberger <lhh@redhat.com>
Date:   Tue Mar 4 17:31:32 2008 -0500

    [CMAN] make qdisk master abdication work in all cases
    
    Red Hat bugzilla 430264

-----------------------------------------------------------------------

Summary of changes:
 cman/qdisk/main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 17e74ef..b3c29f4 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -920,7 +920,8 @@ quorum_loop(qd_ctx *ctx, node_info_t *ni, int max)
 		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 */


hooks/post-receive
--
Cluster Project