Cluster Project branch, RHEL5, updated. cmirror_1_1_15-175-gff1d4ee

[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=ff1d4eebbc91c9fdfd427e84a2013c0a7efddd41

The branch, RHEL5 has been updated
       via  ff1d4eebbc91c9fdfd427e84a2013c0a7efddd41 (commit)
      from  e2db9051981c2cf8fb455c311d32c26180f2f5a4 (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 ff1d4eebbc91c9fdfd427e84a2013c0a7efddd41
Author: Lon Hohberger <lhh@redhat.com>
Date:   Thu Jul 24 16:03:55 2008 -0400

    [qdisk] Make stop_cman="1" work if heuristics fail during initialization
    
    Bugzilla #455865

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

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

diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index b953367..a3d734d 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -509,6 +509,8 @@ quorum_init(qd_ctx *ctx, node_info_t *ni, int max, struct h_data *h, int maxh)
 
 	get_my_score(&score, &maxscore);
 	clulog(LOG_INFO, "Initial score %d/%d\n", score, maxscore);
+	if ((ctx->qc_flags & RF_STOP_CMAN) && (score < score_req))
+		return -1;
 	clulog(LOG_INFO, "Initialization complete\n");
 
 	return 0;


hooks/post-receive
--
Cluster Project