This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
RHEL5 - cman: Revert dirty patch
- From: Christine Caulfield <chrissie at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Fri, 1 Aug 2008 09:39:18 +0000 (UTC)
- Subject: RHEL5 - cman: Revert dirty patch
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4bb7b3ff842ac40a3705d82e74f266b64f8e7609
Commit: 4bb7b3ff842ac40a3705d82e74f266b64f8e7609
Parent: 5a201a3c8c0fde6289514e43faf0ae6e4456db8c
Author: Christine Caulfield <ccaulfie@redhat.com>
AuthorDate: Fri Aug 1 10:38:00 2008 +0100
Committer: Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Fri Aug 1 10:38:00 2008 +0100
cman: Revert dirty patch
Revert patch 4cd89a0d7eef3c0a8f02517957b393a5be736f46 as it
causes bz#457107
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 3fcfbf2..da3cc66 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -1729,8 +1729,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) {