svn commit: r318943 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Fri May 26 12:04:21 2017
New Revision: 318943
URL: https://svnweb.freebsd.org/changeset/base/318943

Log:
  MFV r318942: 8166 zpool scrub thinks it repaired offline device
  
  illumos/illumos-gate at 2d2f193a21231a58c583466dc23ba71f1a25f424
  https://github.com/illumos/illumos-gate/commit/2d2f193a21231a58c583466dc23ba71f1a25f424
  
  https://www.illumos.org/issues/8166
    If we do a scrub while a leaf device is offline (via "zpool offline"),
    we will inadvertently clear the DTL (dirty time log) of the offline
    device, even though it is still damaged. When the device comes back
    online, we will incompletely resilver it, thinking that the scrub
    repaired blocks written before the scrub was started. The incomplete
    resilver can lead to data loss if there is a subsequent failure of a
    different leaf device.
    The fix is to never clear the DTL of offline devices. Note that if a
    device is onlined while a scrub is in progress, the scrub will be
    restarted.
    The problem can be worked around by running "zpool scrub" after
    "zpool online".
    See also https://github.com/zfsonlinux/zfs/issues/5806
  
  Reviewed by: George Wilson george.wilson at delphix.com
  Reviewed by: Brad Lewis <brad.lewis at delphix.com>
  Approved by: Richard Lowe <richlowe at richlowe.net>
  Author: Matthew Ahrens <mahrens at delphix.com>

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Fri May 26 12:02:51 2017	(r318942)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Fri May 26 12:04:21 2017	(r318943)
@@ -1930,6 +1930,9 @@ vdev_dtl_should_excise(vdev_t *vd)
 	ASSERT0(scn->scn_phys.scn_errors);
 	ASSERT0(vd->vdev_children);
 
+	if (vd->vdev_state < VDEV_STATE_DEGRADED)
+		return (B_FALSE);
+
 	if (vd->vdev_resilver_txg == 0 ||
 	    range_tree_space(vd->vdev_dtl[DTL_MISSING]) == 0)
 		return (B_TRUE);