cluster: RHEL53 - cman: Don't eject nodes that were quorate on their own if we have no state

cluster: RHEL53 - cman: Don't eject nodes that were quorate on their own if we have no state

[Chris Feist]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a97856264104f0fe2156daed7a4c637dd1bacf8e
Commit:        a97856264104f0fe2156daed7a4c637dd1bacf8e
Parent:        6d221b0e4603b3f41fef4660846d06664e88dca5
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Tue Feb 17 17:14:00 2009 +0000
Committer:     Chris Feist <cfeist@g2.localdomain>
CommitterDate: Fri Feb 27 15:58:31 2009 -0600

cman: Don't eject nodes that were quorate on their own if we have no state

If a node boots up and becomes quorate on its own (eg because of
expected_votes=1 or qdisk) and another node then joined in the cluster, the
new node would kill the first node because it detects that it had state and
was not previously part of the cluster.

Now it checks to see if the new node also has state. If it does not then
the cluster join is allowed because we are joining a stateful node to
a stateless node and that should be allowed.

bz#485026

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
 cman/daemon/commands.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index 8adbc23..3bd9c66 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -1733,7 +1733,7 @@ static void do_process_transition(int nodeid, char *data, int len)
 	/* 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)) ||
-	     (msg->flags & NODE_FLAGS_DIRTY && msg->first_trans && !node->us)) {
+	     (msg->flags & NODE_FLAGS_DIRTY && msg->first_trans && !node->us && (us->flags & NODE_FLAGS_DIRTY))) {
 		/* Don't duplicate messages */
 		if (node->state != NODESTATE_AISONLY) {
 			if (cluster_is_quorate) {