diff options
| author | LOLi <[email protected]> | 2018-04-04 02:30:14 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-04-03 17:30:14 -0700 |
| commit | f119d00c1fdcb5812fec6a8ff38c1eb9979a7a57 (patch) | |
| tree | bf2afd40d015a12064470fb3975783099d01b867 | |
| parent | 10adee27ced279c381816e1321226fce5834340c (diff) | |
Fix add_nested_replacing_spare test case
Use 'zpool reopen' instead of 'zpool scrub' to kick in the spare device:
this is required to avoid spurious failures caused by a race condition
in events processing by the ZFS Event Daemon:
P1 (zpool scrub) P2 (zed)
---
zfs_ioc_pool_scan()
-> dsl_scan()
-> vdev_reopen()
-> vdev_set_state(VDEV_STATE_CANT_OPEN)
zfs_ioc_vdev_attach()
-> spa_vdev_attach()
-> dsl_resilver_restart()
-> dsl_sync_task()
-> dsl_scan_setup_check()
<- dsl_scan_setup_check(): EBUSY
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #7247
Closes #7342
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zpool_add/add_nested_replacing_spare.ksh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_nested_replacing_spare.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_nested_replacing_spare.ksh index b38079852..ec94df835 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_nested_replacing_spare.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_nested_replacing_spare.ksh @@ -79,7 +79,7 @@ do # 2.1 Fault a device, verify the spare is kicked in log_must zinject -d $FAULT_DEV -e nxio -T all -f 100 $TESTPOOL - log_must zpool scrub $TESTPOOL + log_must zpool reopen $TESTPOOL log_must wait_vdev_state $TESTPOOL $FAULT_DEV "UNAVAIL" 60 log_must wait_vdev_state $TESTPOOL $SPARE_DEV1 "ONLINE" 60 log_must wait_hotspare_state $TESTPOOL $SPARE_DEV1 "INUSE" |