From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12068 invoked by alias); 24 Sep 2008 18:03:29 -0000 Received: (qmail 12061 invoked by alias); 24 Sep 2008 18:03:28 -0000 X-Spam-Status: No, hits=-0.6 required=5.0 tests=AWL,BAYES_05,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: master - cman: Fix broken qdisk main.c patch reverted with scandisk merge To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ba3648a17ab1993c75649c23b048e7ba08b2d596 X-Git-Newrev: e1233f7907e6a7efa96029e9bc0aad4f30095821 From: Lon Hohberger Message-Id: <20080924175655.D577A120437@lists.fedorahosted.org> Date: Wed, 24 Sep 2008 18:04:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 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/msg00518.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e1233f7907e6a7efa96029e9bc0aad4f30095821 Commit: e1233f7907e6a7efa96029e9bc0aad4f30095821 Parent: ba3648a17ab1993c75649c23b048e7ba08b2d596 Author: Lon Hohberger AuthorDate: Fri Sep 5 10:56:50 2008 -0400 Committer: Lon Hohberger CommitterDate: Wed Sep 24 13:48:37 2008 -0400 cman: Fix broken qdisk main.c patch reverted with scandisk merge Re-fixes 442541 --- cman/qdisk/main.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index ef81081..14a1866 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -238,23 +238,6 @@ check_transitions(qd_ctx *ctx, node_info_t *ni, int max, memb_mask_t mask) state_run(ni[x].ni_status.ps_state)) { /* - Write eviction notice if we're the master. - */ - if (ctx->qc_status == S_MASTER) { - log_printf(LOG_NOTICE, - "Writing eviction notice for node %d\n", - ni[x].ni_status.ps_nodeid); - qd_write_status(ctx, ni[x].ni_status.ps_nodeid, - S_EVICT, NULL, NULL, NULL); - if (ctx->qc_flags & RF_ALLOW_KILL) { - log_printf(LOG_DEBUG, "Telling CMAN to " - "kill the node\n"); - cman_kill_node(ctx->qc_ch, - ni[x].ni_status.ps_nodeid); - } - } - - /* Mark our internal views as dead if nodes miss too many heartbeats... This will cause a master transition if no live master exists. @@ -271,6 +254,23 @@ check_transitions(qd_ctx *ctx, node_info_t *ni, int max, memb_mask_t mask) ni[x].ni_evil_incarnation = ni[x].ni_status.ps_incarnation; + /* + Write eviction notice if we're the master. + */ + if (ctx->qc_status == S_MASTER) { + clulog(LOG_NOTICE, + "Writing eviction notice for node %d\n", + ni[x].ni_status.ps_nodeid); + qd_write_status(ctx, ni[x].ni_status.ps_nodeid, + S_EVICT, NULL, NULL, NULL); + if (ctx->qc_flags & RF_ALLOW_KILL) { + clulog(LOG_DEBUG, "Telling CMAN to " + "kill the node\n"); + cman_kill_node(ctx->qc_ch, + ni[x].ni_status.ps_nodeid); + } + } + /* Clear our master mask for the node after eviction */ if (mask) clear_bit(mask, (ni[x].ni_status.ps_nodeid-1),