Attachment 315567 Details for Bug 460909 – Proposed patch

[patch] Proposed patch

cman-firsttrans.patch (text/plain), 1.74 KB, created by Christine Caulfield on 2008-09-02 15:37:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2008-09-02 15:37:24 UTC

Size: 1.74 KB

patch

obsolete

>diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c
>index 0c1fe99..d85cfb8 100644
>--- a/cman/daemon/ais.c
>+++ b/cman/daemon/ais.c
>@@ -299,7 +299,8 @@ static void cman_confchg_fn(enum totem_configuration_type configuration_type,
> 		P_AIS("last memb_count = %d, current = %d\n", last_memb_count, member_list_entries);
> 		send_transition_msg(last_memb_count, first_trans);
> 		last_memb_count = member_list_entries;
>-		first_trans = 0;
>+		if (member_list_entries > 1)
>+			first_trans = 0;
> 
> 		cman_send_confchg(member_list,  member_list_entries,
> 				  saved_left_list, saved_left_list_entries,
>diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
>index 1172f5d..4bcc6c9 100644
>--- a/cman/daemon/commands.c
>+++ b/cman/daemon/commands.c
>@@ -1810,9 +1810,13 @@ static void do_process_transition(int nodeid, char *data)
> 	}
> 	assert(node);
> 
>+	P_MEMB("Got TRANSITION message. msg->flags=%x, node->flags=%x, first_trans=%d\n",
>+	       msg->flags, node->flags, msg->first_trans);
>+
> 	/* Newer nodes 6.1.0 onwards, set the DIRTY flag if they have state. If the new node has been down
> 	   and has state then we mark it disallowed because we cannot merge stateful nodes */
>-	if (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) {
>+	if ( (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) ||
>+	     (msg->flags & NODE_FLAGS_DIRTY && msg->first_trans && !node->us)) {
> 		/* Don't duplicate messages */
> 		if (node->state != NODESTATE_AISONLY) {
> 			if (cluster_is_quorate) {
>@@ -2058,6 +2062,7 @@ void add_ais_node(int nodeid, uint64_t incarnation, int total_members)
> 		node = us;
> 		P_MEMB("Adding AIS node for 'us'\n");
> 	}
>+	P_MEMB("CC: node %s has state %d\n", node->name, node->state);
> 
>  	/* This really should exist!! */
> 	if (!node) {

Actions: View | Diff

Attachments on bug 460909: 315566 | 315567