From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8584 invoked by alias); 2 Jul 2008 12:58:30 -0000 Received: (qmail 8552 invoked by uid 9452); 2 Jul 2008 12:58:30 -0000 Date: Wed, 02 Jul 2008 12:58:00 -0000 Message-ID: <20080702125830.8537.qmail@sourceware.org> From: ccaulfield@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, STABLE2, updated. cluster-2.03.04-31-gf632dfc X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 962d69051c7928a5a0d9e3cdd066b32f9b3f169e X-Git-Newrev: f632dfc8c99199fb0b6acc77fd3697c8c82bf33b Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00004.txt.bz2 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=f632dfc8c99199fb0b6acc77fd3697c8c82bf33b The branch, STABLE2 has been updated via f632dfc8c99199fb0b6acc77fd3697c8c82bf33b (commit) from 962d69051c7928a5a0d9e3cdd066b32f9b3f169e (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 f632dfc8c99199fb0b6acc77fd3697c8c82bf33b Author: Christine Caulfield Date: Wed Jul 2 13:55:08 2008 +0100 [CMAN] Only do timestamp check for older nodes. 6.1.0 nodes set the dirty flag, so there's no point in checking the join timestamp as it just propogates the potential problems that the dirty flag was meant to fix. Signed-off-by: Christine Caulfield ----------------------------------------------------------------------- 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 5008d06..13d06aa 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -1742,7 +1742,8 @@ static void do_process_transition(int nodeid, char *data, int len) /* This is for older nodes. If the join_time of the node matches that already stored AND the node has been down, then we kill it as this must be a rejoin */ - if (msg->join_time == node->cman_join_time && node->flags & NODE_FLAGS_BEENDOWN) { + if (msg->minor_version == 0 && + msg->join_time == node->cman_join_time && node->flags & NODE_FLAGS_BEENDOWN) { /* Don't duplicate messages */ if (node->state != NODESTATE_AISONLY) { if (cluster_is_quorate) { hooks/post-receive -- Cluster Project