This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
STABLE2 - cman: Fix broken qdisk main.c patch reverted with scandiskmerge
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 22 Sep 2008 15:47:32 +0000 (UTC)
- Subject: STABLE2 - cman: Fix broken qdisk main.c patch reverted with scandiskmerge
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=62e48ab2112089fa79aa686a6bed923530c6a3d6
Commit: 62e48ab2112089fa79aa686a6bed923530c6a3d6
Parent: c67dfe5cfc7f72917ac533d7335aa0e465a20f65
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Fri Sep 5 10:56:50 2008 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Sep 22 11:30:48 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 b07ff41..3301d45 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) {
- 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);
- }
- }
-
- /*
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),