svn commit: r330728 - stable/11/cddl/contrib/opensolaris/cmd/zpool
Alan Somers
asomers at FreeBSD.org
Sat Mar 10 03:04:49 UTC 2018
Author: asomers
Date: Sat Mar 10 03:04:48 2018
New Revision: 330728
URL: https://svnweb.freebsd.org/changeset/base/330728
Log:
MFC r329067:
Fix "zpool add" crash when a replacing vdev has a spare child
Fix an assertion in zpool that causes a crash when running any "zpool add"
command on a spare that contains a replacing vdev with a spare child.
This likely affects Illumos, too.
PR: 225546
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D14138
Modified:
stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Sat Mar 10 02:49:58 2018 (r330727)
+++ stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Sat Mar 10 03:04:48 2018 (r330728)
@@ -688,6 +688,21 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
verify(nvlist_lookup_string(cnv,
ZPOOL_CONFIG_TYPE,
&childtype) == 0);
+ if (strcmp(childtype,
+ VDEV_TYPE_SPARE) == 0) {
+ /* We have a replacing vdev with
+ * a spare child. Get the first
+ * real child of the spare
+ */
+ verify(
+ nvlist_lookup_nvlist_array(
+ cnv,
+ ZPOOL_CONFIG_CHILDREN,
+ &rchild,
+ &rchildren) == 0);
+ assert(rchildren >= 2);
+ cnv = rchild[0];
+ }
}
verify(nvlist_lookup_string(cnv,
More information about the svn-src-stable
mailing list