Attachment 302467 Details for Bug 442541 – Fix.

[patch] Fix.

qdiskd-incarnation-order.patch (text/plain), 1.70 KB, created by Lon Hohberger on 2008-04-15 14:58:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2008-04-15 14:58:45 UTC

Size: 1.70 KB

patch

obsolete

>diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
>index b3c29f4..6bec85a 100644
>--- a/cman/qdisk/main.c
>+++ b/cman/qdisk/main.c
>@@ -254,23 +254,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.
>@@ -287,6 +270,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),

Actions: View | Diff

Attachments on bug 442541: 302458 | 302459 | 302467