cluster: RHEL54 - Revert "cman: send fewer messages for each state transition."

cluster: RHEL54 - Revert "cman: send fewer messages for each state transition."

[Chris Feist]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7cb780f480e5ab9b5fe354d84acf28cf118ca9a6
Commit:        7cb780f480e5ab9b5fe354d84acf28cf118ca9a6
Parent:        54abe6db5a5bd10f8958732b938d9c09cb23e566
Author:        Chris Feist <cfeist@redhat.com>
AuthorDate:    Tue Jun 23 12:19:03 2009 -0500
Committer:     Chris Feist <cfeist@redhat.com>
CommitterDate: Tue Jun 23 12:19:03 2009 -0500

Revert "cman: send fewer messages for each state transition."

This reverts commit 54abe6db5a5bd10f8958732b938d9c09cb23e566.

This should only be applied to the RHEL53 and RHEL5 branches.
---
 cman/daemon/commands.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index 710449e..03c7426 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -1712,8 +1712,6 @@ static void do_process_transition(int nodeid, char *data, int len)
 {
 	struct cl_transmsg *msg = (struct cl_transmsg *)data;
 	struct cluster_node *node;
-	unsigned int old_expected;
-	nodestate_t old_state;
 
 	if (valid_transition_msg(nodeid, msg) != 0) {
 		P_MEMB("Transition message from %d does not match current config - should quit ?\n", nodeid);
@@ -1734,8 +1732,6 @@ static void do_process_transition(int nodeid, char *data, int len)
 		add_ais_node(nodeid, incarnation, num_ais_nodes);
 	node = find_node_by_nodeid(nodeid);
 	assert(node);
-	old_expected = node->expected_votes;
-	old_state = node->state;
 
 	P_MEMB("Got TRANSITION message. msg->flags=%x, node->flags=%x, first_trans=%d\n",
 	       msg->flags, node->flags, msg->first_trans);
@@ -1795,9 +1791,7 @@ static void do_process_transition(int nodeid, char *data, int len)
 
 	/* Take into account any new expected_votes value that the new node has */
 	node->expected_votes = msg->expected_votes;
-
-	if (old_state != node->state || old_expected != node->expected_votes)
-		recalculate_quorum(0, 0);
+	recalculate_quorum(0, 0);
 
 	if (node->fence_agent && msg->fence_agent[0] && strcmp(node->fence_agent, msg->fence_agent))
 	{