Attachment 591532 Details for Bug 820821 – Proposed patch - part 3 - try 2

[patch] Proposed patch - part 3 - try 2

2012-06-13-0001-cpg-Enhance-downlist-selection-algorithm.patch (text/plain), 1.61 KB, created by Jan Friesse on 2012-06-13 14:50:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2012-06-13 14:50:33 UTC

Size: 1.61 KB

patch

obsolete

>From eb225e9e62e033e7e584c2b6c99157657f93896f Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Wed, 13 Jun 2012 16:02:15 +0200
>Subject: [PATCH] cpg: Enhance downlist selection algorithm
>
>Let's say we have 2 nodes:
>- node 2 is paused
>- node 1 create membership (one node)
>- node 2 is unpaused
>
>Result is that node 1 downlist is selected, so it means that from node 2
>point of view, node 1 was never down.
>
>Patch solves situation by adding additional check for largest previous
>membership.
>
>So current tests are:
>1) largest (previous #nodes - #nodes know to have left)
>2) (then) largest previous membership
>3) (and last as a tie-breaker) node with smallest nodeid
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>---
> exec/cpg.c |   17 +++++++++--------
> 1 files changed, 9 insertions(+), 8 deletions(-)
>
>diff --git a/exec/cpg.c b/exec/cpg.c
>index 8b883f8..47743a5 100644
>--- a/exec/cpg.c
>+++ b/exec/cpg.c
>@@ -811,16 +811,17 @@ static struct downlist_msg* downlist_master_choose (void)
> 		best_members = best->old_members - best->left_nodes;
> 		cmp_members = cmp->old_members - cmp->left_nodes;
> 
>-		if (cmp_members < best_members) {
>-			continue;
>-		}
>-		else if (cmp_members > best_members) {
>-			best = cmp;
>-		}
>-		else if (cmp->sender_nodeid < best->sender_nodeid) {
>+		if (cmp_members > best_members) {
> 			best = cmp;
>+		} else if (cmp_members == best_members) {
>+			if (cmp->old_members > best->old_members) {
>+				best = cmp;
>+			} else if (cmp->old_members == best->old_members) {
>+				if (cmp->sender_nodeid < best->sender_nodeid) {
>+					best = cmp;
>+				}
>+			}
> 		}
>-
> 	}
> 
> 	assert (best != NULL);
>-- 
>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