[Cluster-devel] cluster/group/daemon main.c

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

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-12-13 19:04:53

Modified files:
	group/daemon   : main.c 

Log message:
	groupd's function that returns info for group status queries was
	mistakenly setting the "member" status to 0 when a node was leaving.
	This led fence_tool to believe that the local node was no longer
	a member (i.e. had finished leaving) when in fact the leave wasn't
	complete yet.
	bz 219385

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/main.c.diff?cvsroot=cluster&r1=1.55&r2=1.56

--- cluster/group/daemon/main.c	2006/12/01 15:24:48	1.55
+++ cluster/group/daemon/main.c	2006/12/13 19:04:53	1.56
@@ -489,7 +489,8 @@
 	/* we're in the member list but are still joining */
 	if (data->member) {
 		ev = g->app->current_event;
-		if (ev && is_our_join(ev))
+		if (ev && is_our_join(ev) &&
+		    (ev->state <= EST_JOIN_ALL_STARTED))
 			data->member = 0;
 	}
 }