Mercurial > illumos > illumos-gate
changeset 13983:fe80600e1f8e
3606 zpool status -x shouldn't warn about old on-disk format
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Richard Elling <richard.elling@dey-sys.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
| author | Tim Connors <tconnors@rather.puzzling.org> |
|---|---|
| date | Mon, 11 Mar 2013 16:29:50 -0800 |
| parents | b7e1d5ab228b |
| children | dc0c7baefe32 |
| files | usr/src/cmd/zpool/zpool_main.c usr/src/man/man1m/zpool.1m |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/zpool/zpool_main.c Mon Mar 11 11:44:37 2013 -0800 +++ b/usr/src/cmd/zpool/zpool_main.c Mon Mar 11 16:29:50 2013 -0800 @@ -3923,7 +3923,10 @@ * If we were given 'zpool status -x', only report those pools with * problems. */ - if (reason == ZPOOL_STATUS_OK && cbp->cb_explain) { + if (cbp->cb_explain && + (reason == ZPOOL_STATUS_OK || + reason == ZPOOL_STATUS_VERSION_OLDER || + reason == ZPOOL_STATUS_FEAT_DISABLED)) { if (!cbp->cb_allpools) { (void) printf(gettext("pool '%s' is healthy\n"), zpool_get_name(zhp));
--- a/usr/src/man/man1m/zpool.1m Mon Mar 11 11:44:37 2013 -0800 +++ b/usr/src/man/man1m/zpool.1m Mon Mar 11 16:29:50 2013 -0800 @@ -1685,7 +1685,8 @@ .ad .RS 6n Only display status for pools that are exhibiting errors or are otherwise -unavailable. +unavailable. Warnings about pools not using the latest on-disk format will +not be included. .RE .sp