mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-21 09:13:37 +00:00
MFV r248266:
Import minor ZFS changes from vendor Illumos ZFS issues: 3604 zdb should print bpobjs more verbosely (fix zdb hang) 3606 zpool status -x shouldn't warn about old on-disk format MFC after: 3 days
This commit is contained in:
commit
0afa556b1b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=248267
|
@ -1225,6 +1225,7 @@ dump_bpobj(bpobj_t *bpo, char *name, int indent)
|
|||
continue;
|
||||
}
|
||||
dump_bpobj(&subbpo, "subobj", indent + 1);
|
||||
bpobj_close(&subbpo);
|
||||
}
|
||||
} else {
|
||||
(void) printf(" %*s: object %llu, %llu blkptrs, %s\n",
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
.\"
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd November 15, 2012
|
||||
.Dd March 14, 2013
|
||||
.Dt ZPOOL 8
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
@ -1608,14 +1608,15 @@ is specified, the command exits after
|
|||
.Ar count
|
||||
reports are printed.
|
||||
.Pp
|
||||
If a scrub or resilver is in progress, this command reports the percentage done
|
||||
and the estimated time to completion. Both of these are only approximate,
|
||||
If a scrub or resilver is in progress, this command reports the percentage
|
||||
done and the estimated time to completion. Both of these are only approximate,
|
||||
because the amount of data in the pool and the other workloads on the system
|
||||
can change.
|
||||
.Bl -tag -width indent
|
||||
.It Fl x
|
||||
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.
|
||||
.It Fl v
|
||||
Displays verbose data error information, printing out a complete list of all
|
||||
data errors since the last complete pool scrub.
|
||||
|
|
|
@ -4031,7 +4031,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));
|
||||
|
|
Loading…
Reference in a new issue