From 412e3c26a9bd284b961c71e4244986622959eefd Mon Sep 17 00:00:00 2001 From: Chunwei Chen Date: Wed, 24 May 2017 15:11:23 -0700 Subject: [PATCH] Fix import finding spare/l2cache when path changes When spare or l2cache device path changes, zpool import will not fix up their paths like normal vdev. The issue is that when you supply a pool name argument to zpool import, it will use it to filter out device which doesn't have the pool name in the label. Since spare and l2cache device never have that in the label, they'll always get filtered out. We fix this by making sure we never filter out a spare or l2cache device. Reviewed by: Richard Elling Reviewed-by: Brian Behlendorf Signed-off-by: Chunwei Chen Closes #6158 --- lib/libzfs/libzfs_import.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c index d0df9e3c2a..0d4240406c 100644 --- a/lib/libzfs/libzfs_import.c +++ b/lib/libzfs/libzfs_import.c @@ -1337,16 +1337,33 @@ zpool_find_import_impl(libzfs_handle_t *hdl, importargs_t *iarg) if (config != NULL) { boolean_t matched = B_TRUE; + boolean_t aux = B_FALSE; char *pname; - if ((iarg->poolname != NULL) && + /* + * Check if it's a spare or l2cache device. If + * it is, we need to skip the name and guid + * check since they don't exist on aux device + * label. + */ + if (iarg->poolname != NULL || + iarg->guid != 0) { + uint64_t state; + aux = nvlist_lookup_uint64(config, + ZPOOL_CONFIG_POOL_STATE, + &state) == 0 && + (state == POOL_STATE_SPARE || + state == POOL_STATE_L2CACHE); + } + + if ((iarg->poolname != NULL) && !aux && (nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME, &pname) == 0)) { if (strcmp(iarg->poolname, pname)) matched = B_FALSE; - } else if (iarg->guid != 0) { + } else if (iarg->guid != 0 && !aux) { uint64_t this_guid; matched = nvlist_lookup_uint64(config,