diff options
author | smh <smh@FreeBSD.org> | 2014-12-25 02:17:17 +0000 |
---|---|---|
committer | smh <smh@FreeBSD.org> | 2014-12-25 02:17:17 +0000 |
commit | b61b2d2e422efaebb1b87808e0bb834f7b53c8b4 (patch) | |
tree | 43b1062891633c712d406a37f161d21d1e389304 /cddl | |
parent | 5309296f8769d8056f8283b83e051e38d00a2b35 (diff) | |
download | FreeBSD-src-b61b2d2e422efaebb1b87808e0bb834f7b53c8b4.zip FreeBSD-src-b61b2d2e422efaebb1b87808e0bb834f7b53c8b4.tar.gz |
Prevent zpool upgrade failing due to unavailable pools
Prior to this fix "zpool upgrade" and "zpool upgrade -a" would fail due to
an assert when operating on unavailable pools.
We now print a warning to stderr but allow the processing of other pools
to procesed.
MFC after: 1 month
Diffstat (limited to 'cddl')
-rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c index 31340b0..8251989 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c @@ -4629,6 +4629,13 @@ upgrade_cb(zpool_handle_t *zhp, void *arg) boolean_t printnl = B_FALSE; int ret; + if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) { + (void) fprintf(stderr, gettext("cannot upgrade '%s': pool is " + "currently unavailable\n\n"), zpool_get_name(zhp)); + /* Allow iteration to continue. */ + return (0); + } + config = zpool_get_config(zhp, NULL); verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); @@ -4729,6 +4736,14 @@ upgrade_list_disabled_cb(zpool_handle_t *zhp, void *arg) nvlist_t *config; uint64_t version; + if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) { + (void) fprintf(stderr, gettext("cannot check supported " + "features on '%s': pool is currently unavailable\n\n"), + zpool_get_name(zhp)); + /* Allow iteration to continue. */ + return (0); + } + config = zpool_get_config(zhp, NULL); verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); |