[Cluster-devel] cluster/cman/daemon commands.c

[pcaulfield at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	pcaulfield at sourceware.org	2007-09-27 09:05:45

Modified files:
	cman/daemon    : commands.c 

Log message:
	Recalculate quorum when we have a new node's expected_votes.
	bz#308581

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.55.2.12&r2=1.55.2.13

--- cluster/cman/daemon/commands.c	2007/09/17 13:48:15	1.55.2.12
+++ cluster/cman/daemon/commands.c	2007/09/27 09:05:45	1.55.2.13
@@ -1770,6 +1770,11 @@
 		node->state = NODESTATE_AISONLY;
 
 	node->flags = msg->flags; /* This will clear the BEENDOWN flag of course */
+
+	/* Take into account any new expected_votes value that the new node has */
+	node->expected_votes = msg->expected_votes;
+	recalculate_quorum(0, 0);
+
 	if (node->fence_agent && msg->fence_agent[0] && strcmp(node->fence_agent, msg->fence_agent))
 	{
 		free(node->fence_agent);