Skip to content

Commit b3a6f80

Browse files
spacelamaChristopher Siden
authored andcommitted
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>
1 parent 7706186 commit b3a6f80

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

usr/src/cmd/zpool/zpool_main.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3923,7 +3923,10 @@ status_callback(zpool_handle_t *zhp, void *data)
39233923
* If we were given 'zpool status -x', only report those pools with
39243924
* problems.
39253925
*/
3926-
if (reason == ZPOOL_STATUS_OK && cbp->cb_explain) {
3926+
if (cbp->cb_explain &&
3927+
(reason == ZPOOL_STATUS_OK ||
3928+
reason == ZPOOL_STATUS_VERSION_OLDER ||
3929+
reason == ZPOOL_STATUS_FEAT_DISABLED)) {
39273930
if (!cbp->cb_allpools) {
39283931
(void) printf(gettext("pool '%s' is healthy\n"),
39293932
zpool_get_name(zhp));

usr/src/man/man1m/zpool.1m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1685,7 +1685,8 @@ can change.
16851685
.ad
16861686
.RS 6n
16871687
Only display status for pools that are exhibiting errors or are otherwise
1688-
unavailable.
1688+
unavailable. Warnings about pools not using the latest on-disk format will
1689+
not be included.
16891690
.RE
16901691

16911692
.sp

0 commit comments

Comments
 (0)