Author: mav
Date: Mon Jul 30 21:59:44 2018
New Revision: 336942
URL: https://svnweb.freebsd.org/changeset/base/336942
Log:
9189 Add debug to vdev_label_read_config when txg check fails
illumos/illumos-gate@b6bf6e1540f30bd97b8d6e2c21d95e17841e0f23
Reviewed by: George Wilson <george.wil...@delphix.com>
Reviewed by: Prashanth Sreenivasa <p...@delphix.com>
Approved by: Matt Ahrens <mahr...@delphix.com>
Author: Pavel Zakharov <pavel.zakha...@delphix.com>
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c Mon Jul 30 21:29:26
2018 (r336941)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c Mon Jul 30 21:59:44
2018 (r336942)
@@ -1585,7 +1585,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);
}
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c Mon Jul 30
21:29:26 2018 (r336941)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c Mon Jul 30
21:59:44 2018 (r336942)
@@ -540,6 +540,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;
@@ -565,8 +566,6 @@ retry:
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
@@ -595,6 +594,15 @@ retry:
if (config == NULL && !(flags & ZIO_FLAG_TRYHARD)) {
flags |= ZIO_FLAG_TRYHARD;
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);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
