Cluster Project branch, STABLE, updated. rgmanager_1_9_66-14-g1843ece

Cluster Project branch, STABLE, updated. rgmanager_1_9_66-14-g1843ece

[lhh]

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=1843ecec265b5eea37b23290f3796460fe064964

The branch, STABLE has been updated
       via  1843ecec265b5eea37b23290f3796460fe064964 (commit)
      from  703bdf832679cdcad3137017cd07640483bed767 (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 1843ecec265b5eea37b23290f3796460fe064964
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 #452137

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

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 a29a5d0..9c1f67b 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -508,6 +508,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