draid: fix cksum errors after rebuild with degraded disks

Currently, when more than nparity disks get faulted during the
rebuild, only first nparity disks would go to faulted state, and
all the remaining disks would go to degraded state. When a hot
spare is attached to that degraded disk for rebuild creating the
spare mirror, only that hot spare is getting rebuilt, but not the
degraded device. So when later during scrub some other attached
draid spare happens to map to that spare, it will end up with
cksum error.

Moreover, if the user clears the degraded disk from errors, the
data won't be resilvered to it, hot spare will be detached almost
immediately and the data that was resilvered only to it will be
lost.

Solution: write to all mirrored devices during rebuild, similar
to traditional/healing resilvering, but only if we can verify
the integrity of the data, or when it's the draid spare we are
writing to, in which case we are writing to a reserved spare
space, and there is no danger to overwrite any good data.

The argument that writing only to rebuilding draid spare vdev is
faster than writing to normal device doesn't hold since, at a
specific offset being rebuilt, draid spare will be mapped to a
normal device anyway.

redundancy_draid_degraded2 automation test is added also to
cover the scenario.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Andriy Tkachuk <atkachuk@wasabi.com>
Closes #18414
This commit is contained in:
Andriy Tkachuk
2026-04-15 22:48:00 +01:00
committed by Tony Hutter
parent eec8b9b929
commit da44040bbb
8 changed files with 235 additions and 19 deletions
+24 -2
View File
@@ -23,6 +23,7 @@
* Copyright (c) 2018 Intel Corporation.
* Copyright (c) 2020 by Lawrence Livermore National Security, LLC.
* Copyright (c) 2025, Klara, Inc.
* Copyright (c) 2026, Wasabi Technologies, Inc.
*/
#include <sys/zfs_context.h>
@@ -1249,8 +1250,7 @@ vdev_draid_missing(vdev_t *vd, uint64_t physical_offset, uint64_t txg,
if (vd == NULL)
return (B_TRUE);
return (vdev_draid_missing(vd, physical_offset,
txg, size));
return (vdev_draid_missing(vd, physical_offset, txg, size));
}
return (vdev_dtl_contains(vd, DTL_MISSING, txg, size));
@@ -1909,12 +1909,34 @@ vdev_draid_io_start_read(zio_t *zio, raidz_row_t *rr)
}
if (vdev_draid_missing(cvd, rc->rc_offset, zio->io_txg, 1)) {
vdev_t *svd;
if (c >= rr->rr_firstdatacol)
rr->rr_missingdata++;
else
rr->rr_missingparity++;
rc->rc_error = SET_ERROR(ESTALE);
rc->rc_skipped = 1;
/*
* If this child has draid spare attached, and that
* spare by rc_offset maps to another spare, the repair
* would go to that spare, and we want all mirrored
* children on it to be updated with the repaired data,
* even when we cannot vouch for it during rebuilds
* (which don't have checksums). Otherwise, we will have
* a lot of checksum errors on that spares during scrub.
* The worst thing that can happen in this case is that
* we will update the reserved spare column on some
* device with unverified data, which is harmless.
*/
if ((svd = vdev_draid_find_spare(cvd)) != NULL) {
svd = vdev_draid_spare_get_child(svd,
rc->rc_offset);
if (svd && (svd->vdev_ops == &vdev_spare_ops ||
svd->vdev_ops == &vdev_replacing_ops))
rc->rc_tgt_is_dspare = 1;
}
continue;
}
+7 -11
View File
@@ -669,23 +669,19 @@ vdev_mirror_io_start(zio_t *zio)
}
while (children--) {
mc = &mm->mm_child[c];
c++;
mc = &mm->mm_child[c++];
/*
* When sequentially resilvering only issue write repair
* IOs to the vdev which is being rebuilt for two reasons:
* 1. The repair IO data calculated from parity has no checksum
* to validate and could be incorrect. Existing data must
* never be overwritten with unconfirmed data to ensure we
* never lock in unrecoverable damage to the pool.
* 2. Performance is limited by the slowest child device. We
* don't want a slower device to limit the rebuild rate for
* faster replacement devices such as distributed spares.
* When sequentially resilvering and the integrity of the data
* is speculative (ZIO_FLAG_SPECULATIVE), issue write repair IOs
* only to the vdev which is being rebuilt. Existing data on
* other children must never be overwritten with unconfirmed
* data to avoid unrecoverable damage to the pool.
*/
if ((zio->io_priority == ZIO_PRIORITY_REBUILD) &&
(zio->io_flags & ZIO_FLAG_IO_REPAIR) &&
!(zio->io_flags & ZIO_FLAG_SCRUB) &&
(zio->io_flags & ZIO_FLAG_SPECULATIVE) &&
mm->mm_rebuilding && !mc->mc_rebuilding) {
continue;
}
+40 -4
View File
@@ -25,6 +25,7 @@
* Copyright (c) 2012, 2020 by Delphix. All rights reserved.
* Copyright (c) 2016 Gvozden Nešković. All rights reserved.
* Copyright (c) 2025, Klara, Inc.
* Copyright (c) 2026, Wasabi Technologies, Inc.
*/
#include <sys/zfs_context.h>
@@ -3104,6 +3105,7 @@ vdev_raidz_io_done_verified(zio_t *zio, raidz_row_t *rr)
int parity_errors = 0;
int parity_untried = 0;
int data_errors = 0;
zio_flag_t add_flags = 0;
ASSERT3U(zio->io_type, ==, ZIO_TYPE_READ);
@@ -3134,10 +3136,30 @@ vdev_raidz_io_done_verified(zio_t *zio, raidz_row_t *rr)
* Note that we also regenerate parity when resilvering so we
* can write it out to failed devices later.
*/
if (parity_errors + parity_untried <
rr->rr_firstdatacol - data_errors ||
(zio->io_flags & ZIO_FLAG_RESILVER)) {
boolean_t parity_verify = (parity_errors + parity_untried) <
(rr->rr_firstdatacol - data_errors);
if (parity_verify || (zio->io_flags & ZIO_FLAG_RESILVER)) {
int n = raidz_parity_verify(zio, rr);
/*
* In, Reed-Solomon encoding, if we have ndata+1 columns and
* the parity doesn't match, it means the data integrity is
* compromised. We shouldn't try to repair anything in this
* case.
*/
if (parity_verify && n > 0 &&
zio->io_priority == ZIO_PRIORITY_REBUILD)
return;
/*
* If we have only ndata columns, the data integrity will
* be checked by the checksums normally, but not in case
* of rebuild when we don't have checksums. In this case,
* we add ZIO_FLAG_SPECULATIVE and try to not spread
* unverified data. For example, when the target vdev happens
* to be the mirroring spare vdev, we would repair only that
* child in it which is being rebuilt.
*/
if (!parity_verify && zio->io_priority == ZIO_PRIORITY_REBUILD)
add_flags |= ZIO_FLAG_SPECULATIVE;
unexpected_errors += n;
}
@@ -3163,13 +3185,27 @@ vdev_raidz_io_done_verified(zio_t *zio, raidz_row_t *rr)
*/
ASSERT0(zio->io_flags & ZIO_FLAG_DIO_READ);
/*
* When the target vdev is draid spare, we should clear
* ZIO_FLAG_SPECULATIVE. First, if that draid spare maps
* to another spare having an online/degraded disk, that
* disk must be repaired also. Otherwise, the scrub will
* detect a lot of cksum errors later. Second, since it
* is draid spare, there is no harm in updating its
* content on any vdev it maps to because the space is
* reserved as a spare anyway.
*/
zio_flag_t aflags = add_flags;
if (rc->rc_tgt_is_dspare)
aflags &= ~ZIO_FLAG_SPECULATIVE;
zio_nowait(zio_vdev_child_io(zio, NULL, cvd,
rc->rc_offset, rc->rc_abd, rc->rc_size,
ZIO_TYPE_WRITE,
zio->io_priority == ZIO_PRIORITY_REBUILD ?
ZIO_PRIORITY_REBUILD : ZIO_PRIORITY_ASYNC_WRITE,
ZIO_FLAG_IO_REPAIR | (unexpected_errors ?
ZIO_FLAG_SELF_HEAL : 0), NULL, NULL));
ZIO_FLAG_SELF_HEAL : 0) | aflags, NULL, NULL));
}
}
+4 -2
View File
@@ -1669,9 +1669,11 @@ zio_vdev_child_io(zio_t *pio, blkptr_t *bp, vdev_t *vd, uint64_t offset,
/*
* If we've decided to do a repair, the write is not speculative --
* even if the original read was.
* even if the original read was. Rebuild is an exception since we
* cannot always ensure its data integrity.
*/
if (flags & ZIO_FLAG_IO_REPAIR)
if ((flags & ZIO_FLAG_IO_REPAIR) &&
pio->io_priority != ZIO_PRIORITY_REBUILD)
flags &= ~ZIO_FLAG_SPECULATIVE;
/*