Cluster Project branch, master, updated. cluster-2.99.06-61-gaa5b80f

Cluster Project branch, master, updated. cluster-2.99.06-61-gaa5b80f

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

The branch, master has been updated
       via  aa5b80fd65ca0ae47bb703a496fa100c5c917328 (commit)
      from  e747c878a8d405342f4611e18905208a52ffc5f0 (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 aa5b80fd65ca0ae47bb703a496fa100c5c917328
Author: Lon Hohberger <lhh@redhat.com>
Date:   Thu Jul 24 16:08:50 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 b630efd..a924ab6 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -500,6 +500,8 @@ quorum_init(qd_ctx *ctx, node_info_t *ni, int max, struct h_data *h, int maxh)
 
 	get_my_score(&score, &maxscore);
 	log_printf(LOG_INFO, "Initial score %d/%d\n", score, maxscore);
+	if ((ctx->qc_flags & RF_STOP_CMAN) && (score < score_req))
+		return -1;
 	log_printf(LOG_INFO, "Initialization complete\n");
 
 	return 0;


hooks/post-receive
--
Cluster Project