MFV r336942: 9189 Add debug to vdev_label_read_config when txg check fails
illumos/illumos-gate@b6bf6e1540 Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Prashanth Sreenivasa <pks@delphix.com> Approved by: Matt Ahrens <mahrens@delphix.com> Author: Pavel Zakharov <pavel.zakharov@delphix.com>
This commit is contained in:
commit
eb235f2f8e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=336943
@ -1725,7 +1725,8 @@ vdev_validate(vdev_t *vd)
|
||||
if ((label = vdev_label_read_config(vd, txg)) == NULL) {
|
||||
vdev_set_state(vd, B_TRUE, VDEV_STATE_CANT_OPEN,
|
||||
VDEV_AUX_BAD_LABEL);
|
||||
vdev_dbgmsg(vd, "vdev_validate: failed reading config");
|
||||
vdev_dbgmsg(vd, "vdev_validate: failed reading config for "
|
||||
"txg %llu", (u_longlong_t)txg);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
@ -546,6 +546,7 @@ vdev_label_read_config(vdev_t *vd, uint64_t txg)
|
||||
abd_t *vp_abd;
|
||||
zio_t *zio;
|
||||
uint64_t best_txg = 0;
|
||||
uint64_t label_txg = 0;
|
||||
int error = 0;
|
||||
int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL |
|
||||
ZIO_FLAG_SPECULATIVE;
|
||||
@ -571,8 +572,6 @@ vdev_label_read_config(vdev_t *vd, uint64_t txg)
|
||||
if (zio_wait(zio) == 0 &&
|
||||
nvlist_unpack(vp->vp_nvlist, sizeof (vp->vp_nvlist),
|
||||
&label, 0) == 0) {
|
||||
uint64_t label_txg = 0;
|
||||
|
||||
/*
|
||||
* Auxiliary vdevs won't have txg values in their
|
||||
* labels and newly added vdevs may not have been
|
||||
@ -603,6 +602,15 @@ vdev_label_read_config(vdev_t *vd, uint64_t txg)
|
||||
goto retry;
|
||||
}
|
||||
|
||||
/*
|
||||
* We found a valid label but it didn't pass txg restrictions.
|
||||
*/
|
||||
if (config == NULL && label_txg != 0) {
|
||||
vdev_dbgmsg(vd, "label discarded as txg is too large "
|
||||
"(%llu > %llu)", (u_longlong_t)label_txg,
|
||||
(u_longlong_t)txg);
|
||||
}
|
||||
|
||||
abd_free(vp_abd);
|
||||
|
||||
return (config);
|
||||
|
Loading…
Reference in New Issue
Block a user