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=288ab73e51f51ce174f51dc2fc67c6dd1fe03e85 The branch, master has been updated via 288ab73e51f51ce174f51dc2fc67c6dd1fe03e85 (commit) from 0732a367878643b4dc4fc9d37d0b24dbcd623f25 (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 288ab73e51f51ce174f51dc2fc67c6dd1fe03e85 Author: Christine Caulfield <[EMAIL PROTECTED]> Date: Mon Apr 21 11:34:11 2008 +0100 [CMAN] Disallow a new dirty node from joining the cman cluster Patch from David Robinson, bz#443358 Signed-off-by: Christine Caulfield <[EMAIL PROTECTED]> ----------------------------------------------------------------------- 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 27e6697..09802c2 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -1787,7 +1787,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
