Attachment 638650 Details for Bug 854216 – Proposed patch

[patch] Proposed patch

patch.patch (text/plain), 1.64 KB, created by Jan Friesse on 2012-11-05 14:34:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2012-11-05 14:34:21 UTC

Size: 1.64 KB

patch

obsolete

>From: Jan Friesse <jfriesse@redhat.com>
>Date: Wed Oct 24 10:08:40 UTC 2012
>Subject: [PATCH] If failed_to_recv is set, consensus can be empty
>
>If failed_to_recv is set (node detect itself not able to receive
>message), we can end up with assert, because my_failed_list and
>my_member_list are same list. This is happening because we are not
>following specification and we allow to mark node itself as failed.
>Because if failed_to_recv is set and we reached consensus across nodes,
>single node membership is created (ignoring both fail list and
>member_list), we can skip assert.
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>---
> exec/totemsrp.c |   15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
>diff --git a/exec/totemsrp.c b/exec/totemsrp.c
>index ec951df..a4cc19a 100644
>--- a/exec/totemsrp.c
>+++ b/exec/totemsrp.c
>@@ -1247,6 +1247,16 @@ static int memb_consensus_agreed (
> 			break;
> 		}
> 	}
>+
>+	if (agreed && instance->failed_to_recv == 1) {
>+		/*
>+		 * Both nodes agreed on our failure. We don't care how many proc list items left because we
>+		 * will create single ring anyway.
>+		 */
>+
>+		 return (agreed);
>+	}
>+
> 	assert (token_memb_entries >= 1);
> 
> 	return (agreed);
>@@ -3617,6 +3627,11 @@ printf ("token seq %d\n", token->seq);
> 			instance->my_aru_count = 0;
> 		}
> 
>+		/*
>+		 * We really don't follow specification there. In specification, OTHER nodes
>+		 * detect failure of one node (based on aru_count) and my_id IS NEVER added
>+		 * to failed list (so node never mark itself as failed)
>+		 */
> 		if (instance->my_aru_count > instance->totem_config->fail_to_recv_const &&
> 			token->aru_addr == instance->my_id.addr[0].nodeid) {
> 
>--

Actions: View | Diff

Attachments on bug 854216: 638650