From 38a19edd34f6a3fc0c8d0f6b9750fc2df2856c9f Mon Sep 17 00:00:00 2001 From: Pavel Zakharov Date: Wed, 14 Sep 2016 11:01:40 -0400 Subject: OpenZFS 9189 - Add debug to vdev_label_read_config when txg check fails These changes were added to help debug issue #9187. Essentially, in the original bug, vdev_validate() seems to fails in vdev_label_read_config() and prints "failed reading config". This could happen because either: 1. The labels are actually corrupt and zio_wait() fails for all of them 2. The labels were discarded because they didn't pass the txg check. Beyond 9187, having debug info when case 2 happens could be useful in other scenarios, such as zpool import. Authored by: Pavel Zakharov Reviewed by: George Wilson Reviewed by: Prashanth Sreenivasa Reviewed-by: Giuseppe Di Natale Approved by: Matt Ahrens Ported-by: Brian Behlendorf OpenZFS-issue: https://illumos.org/issues/9189 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f6af1b7 Closes #7533 --- module/zfs/vdev_label.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'module/zfs/vdev_label.c') diff --git a/module/zfs/vdev_label.c b/module/zfs/vdev_label.c index 85d133a5a..e5ba7cdc2 100644 --- a/module/zfs/vdev_label.c +++ b/module/zfs/vdev_label.c @@ -673,6 +673,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; @@ -698,8 +699,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 @@ -730,6 +729,15 @@ retry: 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); -- cgit v1.2.3