Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

zed: Prevent special vdev to be replaced by hot spare 

Special vdevs should not be replaced by a hot spare.
Log vdevs already support this, extending the
functionality for special vdevs.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>
Closes #14129
This commit is contained in:
Ameer Hamza 2022-11-04 23:33:47 +05:00 committed by GitHub
parent 73b8f700b6
commit c23738c70e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/zfs/spa.c
View File

@ -6819,10 +6819,12 @@ spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing,
return (spa_vdev_exit(spa, newrootvd, txg, error)); return (spa_vdev_exit(spa, newrootvd, txg, error));
/* /*
* Spares can't replace logs * log, dedup and special vdevs should not be replaced by spares.
*/ */
if (oldvd->vdev_top->vdev_islog && newvd->vdev_isspare) if ((oldvd->vdev_top->vdev_alloc_bias != VDEV_BIAS_NONE ||
oldvd->vdev_top->vdev_islog) && newvd->vdev_isspare) {
return (spa_vdev_exit(spa, newrootvd, txg, ENOTSUP)); return (spa_vdev_exit(spa, newrootvd, txg, ENOTSUP));
}
/* /*
* A dRAID spare can only replace a child of its parent dRAID vdev. * A dRAID spare can only replace a child of its parent dRAID vdev.

5
tests/zfs-tests/tests/functional/fault/auto_offline_001_pos.ksh
View File

@ -121,6 +121,11 @@ done
# the removed data device # the removed data device
for conf in "${poolconfs[@]}" for conf in "${poolconfs[@]}"
do do
# special vdev can not be replaced by a hot spare
if [[ $conf = *"special mirror"* ]]; then
continue
fi
# 1. Create a pool with a spare # 1. Create a pool with a spare
log_must zpool create -f $TESTPOOL $conf log_must zpool create -f $TESTPOOL $conf
block_device_wait ${DEV_DSKDIR}/${removedev} block_device_wait ${DEV_DSKDIR}/${removedev}