Cluster Project branch, STABLE2, updated. cluster-2.03.00-22-gb01cdba

[ccaulfield@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=b01cdba509d81b3a660ad85302765ee2294fad11

The branch, STABLE2 has been updated
       via  b01cdba509d81b3a660ad85302765ee2294fad11 (commit)
      from  e1fbc8c16993ba4b6957f20c21473ecddbe824e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b01cdba509d81b3a660ad85302765ee2294fad11
Author: Christine Caulfield <ccaulfie@redhat.com>
Date:   Mon Apr 21 11:40:58 2008 +0100

    [CMAN] Disallow a new dirty node from joining the cman cluster
    
    Patch from David Robinson, bz#443358
    
    Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 cman/daemon/commands.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index c96fe52..9ea1e89 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -1733,7 +1733,8 @@ 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) {
+	if (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN ||
+	    (us->flags & NODE_FLAGS_DIRTY && nodeid != us->node_id))) {
 		/* Don't duplicate messages */
 		if (node->state != NODESTATE_AISONLY) {
 			if (cluster_is_quorate) {


hooks/post-receive
--
Cluster Project