From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6961 invoked by alias); 24 Jul 2008 20:04:10 -0000 Received: (qmail 6931 invoked by uid 9476); 24 Jul 2008 20:04:09 -0000 Date: Thu, 24 Jul 2008 20:04:00 -0000 Message-ID: <20080724200409.6915.qmail@sourceware.org> From: lhh@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-175-gff1d4ee X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: e2db9051981c2cf8fb455c311d32c26180f2f5a4 X-Git-Newrev: ff1d4eebbc91c9fdfd427e84a2013c0a7efddd41 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/msg00135.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=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 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