Attachment 590918 Details for Bug 820821 – Proposed patch

[patch] Proposed patch

2012-06-11-0001-cpg-Never-choose-downlist-with-localnode.patch (text/plain), 1.77 KB, created by Jan Friesse on 2012-06-11 12:41:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2012-06-11 12:41:31 UTC

Size: 1.77 KB

patch

obsolete

>From 242e34e3928a3381a81d95ec6cc0696dbbb83038 Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Mon, 11 Jun 2012 14:35:16 +0200
>Subject: [PATCH] cpg: Never choose downlist with localnode
>
>Test scenario is follows:
>- node 1, node 2
>- node 1 is paused
>- node 2 sees node 1 dead
>- node 1 unpaused
>- node 1 and 2 both choose same dowlist message which includes node 2 ->
>node 2 is efectivelly disconnected
>
>Patch includes additional test if left_node is localnode. If so, such
>downlist is ignored.
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>---
> exec/cpg.c |   21 +++++++++++++++++++++
> 1 files changed, 21 insertions(+), 0 deletions(-)
>
>diff --git a/exec/cpg.c b/exec/cpg.c
>index da60d80..f7acbc8 100644
>--- a/exec/cpg.c
>+++ b/exec/cpg.c
>@@ -724,6 +724,8 @@ static struct downlist_msg* downlist_master_choose (void)
> 	struct list_head *iter;
> 	uint32_t cmp_members;
> 	uint32_t best_members;
>+	uint32_t i;
>+	int ignore_msg;
> 
> 	for (iter = downlist_messages_head.next;
> 		iter != &downlist_messages_head;
>@@ -731,10 +733,26 @@ static struct downlist_msg* downlist_master_choose (void)
> 
> 		cmp = list_entry(iter, struct downlist_msg, list);
> 		downlist_log("comparing", cmp);
>+
>+		ignore_msg = 0;
>+		for (i = 0; i < cmp->left_nodes; i++) {
>+			if (cmp->nodeids[i] == api->totem_nodeid_get()) {
>+				log_printf (LOG_DEBUG, "Ignoring this entry because I'm in the left list\n");
>+
>+				ignore_msg = 1;
>+				break;
>+			}
>+		}
>+
>+		if (ignore_msg) {
>+			continue ;
>+		}
>+
> 		if (best == NULL) {
> 			best = cmp;
> 			continue;
> 		}
>+
> 		best_members = best->old_members - best->left_nodes;
> 		cmp_members = cmp->old_members - cmp->left_nodes;
> 
>@@ -749,6 +767,9 @@ static struct downlist_msg* downlist_master_choose (void)
> 		}
> 
> 	}
>+
>+	assert (best != NULL);
>+
> 	return best;
> }
> 
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 820821: 583724 | 584502 | 584503 | 584918 | 584944 | 589886 | 590918 | 591194 | 591509 | 591532 | 592063 | 593132 | 593133 | 640873 | 640874 | 640875