]> granicus.if.org Git - zfs/commit
Fix consistency of ztest_device_removal_active
authorTom Caputi <tcaputi@datto.com>
Thu, 29 Nov 2018 04:47:09 +0000 (23:47 -0500)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 29 Nov 2018 04:47:09 +0000 (20:47 -0800)
commitc40a1124e1d1010b665909ad31d2904630018f6f
tree10e4f67bf0127d85dfa5085ca0ff09bf37605d6c
parentc71c8c715b7a4f6b842f8f04c18a93086012e2a0
Fix consistency of ztest_device_removal_active

ztest currently uses the boolean flag ztest_device_removal_active
to protect some tests that may not run successfully if they occur
at the same time as ztest_device_removal(). Unfortunately, in the
event that ztest is in the middle of a device removal when it
decides to issue a SIGKILL, the device removal will be
automatically restarted (without setting the flag) when the pool
is re-imported on the next run. This patch corrects this by
ensuring that any in-progress removals are completed before running
further tests after the re-import.

This patch also makes a few small changes to prevent race conditions
involving the creation and destruction of spa->spa_vdev_removal,
since this field is not protected by any locks. Some checks that
may run concurrently with setting / unsetting this field have been
updated to check spa->spa_removing_phys.sr_state instead. The most
significant change here is that spa_removal_get_stats() no longer
accounts for in-flight work done, since that could result in a NULL
pointer dereference.

Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #8105
cmd/ztest/ztest.c
module/zfs/spa_checkpoint.c
module/zfs/vdev_removal.c