public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* RHEL5 - cman: Revert dirty patch
@ 2008-08-01 10:15 Christine Caulfield
0 siblings, 0 replies; only message in thread
From: Christine Caulfield @ 2008-08-01 10:15 UTC (permalink / raw)
To: cluster-cvs-relay
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) {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-08-01 9:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-08-01 10:15 RHEL5 - cman: Revert dirty patch Christine Caulfield
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).