[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-56-g4cd89a0

[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-56-g4cd89a0

[ccaulfield]

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=4cd89a0d7eef3c0a8f02517957b393a5be736f46

The branch, RHEL5 has been updated
       via  4cd89a0d7eef3c0a8f02517957b393a5be736f46 (commit)
      from  24928665b41b6e2b92f32ea051143f48ba5fb8ec (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 4cd89a0d7eef3c0a8f02517957b393a5be736f46
Author: Christine Caulfield <ccaulfie@redhat.com>
Date:   Mon Apr 28 16:07:08 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 eb96fcd..71089d9 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -1721,7 +1721,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