public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: Christine Caulfield <chrissie@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: STABLE2 - cman: revert dirty patch
Date: Fri, 01 Aug 2008 09:40:00 -0000	[thread overview]
Message-ID: <20080801092445.D1ABEA8256@lists.fedorahosted.org> (raw)

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=89ff10632d43b91a64f2b2612cd6186a370a7268
Commit:        89ff10632d43b91a64f2b2612cd6186a370a7268
Parent:        405dbcb97c1dbd5136664948f96c2bec285ac489
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Fri Aug 1 10:24:09 2008 +0100
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Fri Aug 1 10:24:09 2008 +0100

cman: revert dirty patch

Revert patch b01cdba509d81b3a660ad85302765ee2294fad11

see bz#443358

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

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


                 reply	other threads:[~2008-08-01  9:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080801092445.D1ABEA8256@lists.fedorahosted.org \
    --to=chrissie@fedoraproject.org \
    --cc=cluster-cvs-relay@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).