[Cluster-devel] cluster/cman-kernel/src membership.c

[pcaulfield@sourceware.org <pcaulfield@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	pcaulfield at sourceware.org	2006-06-26 08:54:37

Modified files:
	cman-kernel/src: membership.c 

Log message:
	If we get a Master-HELLO and we are not the master for this transition then
	kick off a new one to resolve the ambiguity.
	
	I reckon this was probably the cause of the first trouble in bz#194491

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman-kernel/src/membership.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.44.2.18.6.6&r2=1.44.2.18.6.7

--- cluster/cman-kernel/src/Attic/membership.c	2006/05/09 10:37:08	1.44.2.18.6.6
+++ cluster/cman-kernel/src/Attic/membership.c	2006/06/26 08:54:36	1.44.2.18.6.7
@@ -2882,6 +2882,13 @@
 		}
 	}
 
+	/* If we get a master hello and we are not the master then start a CHECK transition, cos the
+	   real master must have gone away in a period of confusion */
+	if (node_state != MASTER && hellomsg->flags & HELLO_FLAG_MASTER) {
+		node = find_node_by_nodeid(saddr->scl_nodeid);
+		start_transition(TRANS_CHECK, node);
+	}
+
 	return 0;
 
 }