Cluster Project branch, master, updated. cluster-2.99.00-37-g808735b

[teigland@sourceware.org]

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=808735b8d2361585fe1292d32ac32671539ee144

The branch, master has been updated
       via  808735b8d2361585fe1292d32ac32671539ee144 (commit)
      from  be636f43283d12906c75b1ff4783d582040c0b25 (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 808735b8d2361585fe1292d32ac32671539ee144
Author: David Teigland <teigland@redhat.com>
Date:   Mon May 12 16:57:13 2008 -0500

    dlm_controld: remove unworking re-merge detection
    
    Comment out the code that's supposed to detect when nodes are being
    remerged after a transient partition; it's not smart enough yet.
    
    Signed-off-by: David Teigland <teigland@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 group/dlm_controld/cpg.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c
index 6fd7a22..38babd6 100644
--- a/group/dlm_controld/cpg.c
+++ b/group/dlm_controld/cpg.c
@@ -760,6 +760,7 @@ static int match_change(struct lockspace *ls, struct change *cg,
 	if (members_mismatch)
 		return 0;
 
+	log_group(ls, "match_change done %d:%u", hd->nodeid, seq);
 	return 1;
 }
 
@@ -913,6 +914,7 @@ static void receive_start(struct lockspace *ls, struct dlm_header *hd, int len)
 
 	memb->start_flags = hd->flags;
 
+#if 0
 	joining = (memb->start_flags & DLM_MFLG_JOINING) ? 1 : 0;
 	added = is_added(ls, hd->nodeid);
 
@@ -920,10 +922,11 @@ static void receive_start(struct lockspace *ls, struct dlm_header *hd, int len)
 		log_error("receive_start %d:%u disallowed added %d joining %d",
 			  hd->nodeid, seq, added, joining);
 		memb->disallowed = 1;
-	} else {
-		node_history_start(ls, hd->nodeid);
-		memb->start = 1;
+		return;
 	}
+#endif
+	node_history_start(ls, hd->nodeid);
+	memb->start = 1;
 }
 
 static int we_joined(struct lockspace *ls)


hooks/post-receive
--
Cluster Project