svn commit: r305509 - head/sys/geom/mirror

[Mark Johnston]

Author: markj
Date: Tue Sep  6 23:42:59 2016
New Revision: 305509
URL: https://svnweb.freebsd.org/changeset/base/305509

Log:
  Don't treat an error from g_mirror_clear_metadata() as fatal.
  
  Such errors can occur as the result of a write error or because the disk
  backing the mirror element was removed. They result in a generation ID bump
  on all active elements of the mirror, so we can safely disconnect the mirror
  component rather than destroy it.
  
  MFC after:	2 weeks
  Sponsored by:	EMC / Isilon Storage Division
  Differential Revision:	https://reviews.freebsd.org/D7750

Modified:
  head/sys/geom/mirror/g_mirror.c

Modified: head/sys/geom/mirror/g_mirror.c
==============================================================================
--- head/sys/geom/mirror/g_mirror.c	Tue Sep  6 23:35:48 2016	(r305508)
+++ head/sys/geom/mirror/g_mirror.c	Tue Sep  6 23:42:59 2016	(r305509)
@@ -2678,8 +2678,12 @@ again:
 		int error;
 
 		error = g_mirror_clear_metadata(disk);
-		if (error != 0)
-			return (error);
+		if (error != 0) {
+			G_MIRROR_DEBUG(0,
+			    "Device %s: failed to clear metadata on %s: %d.",
+			    sc->sc_name, g_mirror_get_diskname(disk), error);
+			break;
+		}
 		DISK_STATE_CHANGED();
 		G_MIRROR_DEBUG(0, "Device %s: provider %s destroyed.",
 		    sc->sc_name, g_mirror_get_diskname(disk));