From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8373 invoked by alias); 24 Jul 2008 20:05:42 -0000 Received: (qmail 8340 invoked by uid 9476); 24 Jul 2008 20:05:41 -0000 Date: Thu, 24 Jul 2008 20:05:00 -0000 Message-ID: <20080724200541.8325.qmail@sourceware.org> From: lhh@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, STABLE2, updated. cluster-2.03.05-21-g7187d03 X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: b915def8bbc9cb392663aaa457e619dc35a33705 X-Git-Newrev: 7187d03f725fb36bd636d7dd49323e7c1835e5c8 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00136.txt.bz2 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=7187d03f725fb36bd636d7dd49323e7c1835e5c8 The branch, STABLE2 has been updated via 7187d03f725fb36bd636d7dd49323e7c1835e5c8 (commit) from b915def8bbc9cb392663aaa457e619dc35a33705 (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 7187d03f725fb36bd636d7dd49323e7c1835e5c8 Author: Lon Hohberger 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 e9ef495..c219642 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -493,6 +493,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