Skip to content

Commit

Permalink
MFC r318943 (avg):
Browse files Browse the repository at this point in the history
 MFV r318942: 8166 zpool scrub thinks it repaired offline device

 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 openzfs/zfs#5806

PR:		219537
Approved by:	re (kib)
Sponsored by:	The FreeBSD Foundation


git-svn-id: https://svn.freebsd.org/base/stable/11@319624 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
  • Loading branch information
gjb committed Jun 6, 2017
1 parent 6197d93 commit 2a70285
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1929,6 +1929,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);
Expand Down

0 comments on commit 2a70285

Please sign in to comment.