cluster: STABLE32 - dlm_controld: fix handling of startup partition merge

David Teigland teigland at fedoraproject.org
Thu Mar 1 22:14:59 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6815deffc9f90106f21d049bd694a6592d935597
Commit:        6815deffc9f90106f21d049bd694a6592d935597
Parent:        2d3d65ac704589f3e391486dd08f1c7a7b93a731
Author:        David Teigland <teigland at redhat.com>
AuthorDate:    Mon Oct 31 13:04:43 2011 -0500
Committer:     David Teigland <teigland at redhat.com>
CommitterDate: Thu Mar 1 16:14:31 2012 -0600

dlm_controld: fix handling of startup partition merge

Nack messages are not matched correctly with previous change
structs.  Normal start messages should not be matched with
changes that preceeded the node's join time, but nack messages
should, so the match_change() function needs to distinguish.

This can occur when two nodes are joining a lockspace, but
neither has completed when a cluster partition+merge happens.

bz 750314

Signed-off-by: David Teigland <teigland at redhat.com>
---
 group/dlm_controld/action.c |    6 +++++-
 group/dlm_controld/cpg.c    |    9 ++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/group/dlm_controld/action.c b/group/dlm_controld/action.c
index 0570a2f..56401a3 100644
--- a/group/dlm_controld/action.c
+++ b/group/dlm_controld/action.c
@@ -424,7 +424,11 @@ int set_configfs_members(char *name, int new_count, int *new_members,
 			if (rv) {
 				log_error("%s: renew rmdir failed: %d",
 					  path, errno);
-				goto out;
+
+				/* don't quit here, there's a case where
+				 * this can happen, where a node identified
+				 * for renewal was not really added
+				 * previously */
 			}
 		}
 
diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c
index 12cb202..ffb55b4 100644
--- a/group/dlm_controld/cpg.c
+++ b/group/dlm_controld/cpg.c
@@ -953,7 +953,14 @@ static int match_change(struct lockspace *ls, struct change *cg,
 			  "cluster add %llu", hd->nodeid, seq, cg->seq,
 			  (unsigned long long)cg->create_time,
 			  (unsigned long long)node->cluster_add_time);
-		return 0;
+
+		/* nacks can apply to older cg's */
+		if (!(hd->flags & DLM_MFLG_NACK)) {
+			return 0;
+		} else {
+			log_group(ls, "match_change %d:%u unskip cg %u for nack",
+				  hd->nodeid, seq, cg->seq);
+		}
 	}
 
 	/* verify this is the right change by matching the counts


More information about the cluster-commits mailing list