Skip to content

Commit

Permalink
3606 zpool status -x shouldn't warn about old on-disk format
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tim Connors authored and Christopher Siden committed Mar 12, 2013
1 parent 7706186 commit b3a6f80
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 4 additions & 1 deletion usr/src/cmd/zpool/zpool_main.c
Expand Up @@ -3923,7 +3923,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));
Expand Down
3 changes: 2 additions & 1 deletion usr/src/man/man1m/zpool.1m
Expand Up @@ -1685,7 +1685,8 @@ can change.
.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
Expand Down

0 comments on commit b3a6f80

Please sign in to comment.