Skip to content

Commit

Permalink
Cancel initialize and TRIM before vdev_metaslab_fini()
Browse files Browse the repository at this point in the history
Any running 'zpool initialize' or TRIM must be cancelled prior
to the vdev_metaslab_fini() call in spa_vdev_remove_log() which
will unload the metaslabs and set ms->ms_group == NULL.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8602
Closes openzfs#9751
  • Loading branch information
behlendorf authored and tonyhutter committed Jan 2, 2020
1 parent fd0efb1 commit ba8e51f
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions module/zfs/vdev_removal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1861,6 +1861,13 @@ spa_vdev_remove_log(vdev_t *vd, uint64_t *txg)
spa_vdev_config_exit(spa, NULL,
*txg + TXG_CONCURRENT_STATES + TXG_DEFER_SIZE, 0, FTAG);

/*
* Cancel any initialize or TRIM which was in progress.
*/
vdev_initialize_stop_all(vd, VDEV_INITIALIZE_CANCELED);
vdev_trim_stop_all(vd, VDEV_TRIM_CANCELED);
vdev_autotrim_stop_wait(vd);

/*
* Evacuate the device. We don't hold the config lock as
* writer since we need to do I/O but we do keep the
Expand Down Expand Up @@ -1891,12 +1898,6 @@ spa_vdev_remove_log(vdev_t *vd, uint64_t *txg)
vdev_metaslab_fini(vd);

spa_vdev_config_exit(spa, NULL, *txg, 0, FTAG);

/* Stop initializing and TRIM */
vdev_initialize_stop_all(vd, VDEV_INITIALIZE_CANCELED);
vdev_trim_stop_all(vd, VDEV_TRIM_CANCELED);
vdev_autotrim_stop_wait(vd);

*txg = spa_vdev_config_enter(spa);

sysevent_t *ev = spa_event_create(spa, vd, NULL,
Expand Down

0 comments on commit ba8e51f

Please sign in to comment.