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

Exclude log device ashift from normal class 

When opening a log device during import its allocation bias will
not yet have been set by vdev_load().  This results in the log
device's ashift being incorrectly applied to the maximum ashift
of the vdevs in the normal class.  Which in turn prevents the
removal of any top-level devices due to the ashift check in the
spa_vdev_remove_top_check() function.

This issue is resolved by including vdev_islog in the check since
it will be set correctly during vdev_open().

Reviewed-by: Matt Ahrens <mahrens@delphix.com>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8735
This commit is contained in:
Brian Behlendorf 2019-05-29 11:35:50 -07:00
parent 580256045b
commit a1eaf0dde0
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
module/zfs/vdev.c
View File

@ -1852,13 +1852,10 @@ vdev_open(vdev_t *vd)
/* /*
* Track the min and max ashift values for normal data devices. * Track the min and max ashift values for normal data devices.
*
* DJB - TBD these should perhaps be tracked per allocation class
* (e.g. spa_min_ashift is used to round up post compression buffers)
*/ */
if (vd->vdev_top == vd && vd->vdev_ashift != 0 && if (vd->vdev_top == vd && vd->vdev_ashift != 0 &&
vd->vdev_alloc_bias == VDEV_BIAS_NONE && vd->vdev_alloc_bias == VDEV_BIAS_NONE &&
vd->vdev_aux == NULL) { vd->vdev_islog == 0 && vd->vdev_aux == NULL) {
if (vd->vdev_ashift > spa->spa_max_ashift) if (vd->vdev_ashift > spa->spa_max_ashift)
spa->spa_max_ashift = vd->vdev_ashift; spa->spa_max_ashift = vd->vdev_ashift;
if (vd->vdev_ashift < spa->spa_min_ashift) if (vd->vdev_ashift < spa->spa_min_ashift)