changeset 13030:1ff0c65b2b90

6967759 reconfiguring cluster failfasts when rpc.metad cores during set removal
author Peter Dennis - Sustaining Engineer <Peter.Dennis@Oracle.COM>
date Thu, 05 Aug 2010 13:34:37 +0100
parents cce6a2186e4e
children b11dd158cab1
files usr/src/lib/lvm/libmeta/common/meta_mn_subr.c
diffstat 1 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/lvm/libmeta/common/meta_mn_subr.c	Thu Aug 05 08:19:42 2010 -0400
+++ b/usr/src/lib/lvm/libmeta/common/meta_mn_subr.c	Thu Aug 05 13:34:37 2010 +0100
@@ -19,8 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 
@@ -64,7 +63,15 @@
 	    (strcmp(sp->setname, MD_LOCAL_NAME) == 0))
 		return (0);
 	sd = metaget_setdesc(sp, ep);
-	ASSERT(sd != NULL);
+
+	/*
+	 * sd can be NULL if there is a difference between
+	 * the setrecords and the setlistp caches. This can happen
+	 * if this function is called while a set is being
+	 * removed during a cluster reconfiguration.
+	 */
+	if (sd == NULL)
+		return (0);
 	if (sd->sd_flags & MD_SR_MN)
 		return (1);
 	return (0);