diff options
| author | Tim Connors <[email protected]> | 2013-02-26 08:00:45 +1100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-02-28 09:17:09 -0800 |
| commit | c5b247f3354d5c9e24577af997c84d90625620a6 (patch) | |
| tree | 9ff534477bb8dbfb4747e9b5b989697138f21ed9 | |
| parent | d9b0ebbe824469d178a05b0fb9004e4afce86009 (diff) | |
-x shouldn't warn about old on-disk format or unavailable features
`zpool status -x` should only flag errors or where the pool is
unavailable. If it imported fine but isn't using the latest features
available in the code, that's not an error.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1319
| -rw-r--r-- | cmd/zpool/zpool_main.c | 5 | ||||
| -rw-r--r-- | man/man8/zpool.8 | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index c52bd3ed7..320069873 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -3970,7 +3970,10 @@ status_callback(zpool_handle_t *zhp, void *data) * 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)); diff --git a/man/man8/zpool.8 b/man/man8/zpool.8 index d5f61cfed..c16cd6897 100644 --- a/man/man8/zpool.8 +++ b/man/man8/zpool.8 @@ -1604,7 +1604,7 @@ If a scrub or resilver is in progress, this command reports the percentage done .ad .RS 6n .rt -Only display status for pools that are exhibiting errors or are otherwise unavailable. +Only display status for pools that are exhibiting errors or are otherwise unavailable. Warnings about pools not using the latest on-disk format will not be included. .RE .sp |