]> git.proxmox.com Git - mirror_zfs.git/commit
ZTS: Minimize udev_wait in zvol_misc tests
authorRyan Moeller <ryan@iXsystems.com>
Fri, 1 Oct 2021 15:36:02 +0000 (11:36 -0400)
committerGitHub <noreply@github.com>
Fri, 1 Oct 2021 15:36:02 +0000 (09:36 -0600)
commit96ad227a9dad38dd928bda6016240f590e7968b1
tree882e897803614b733573d60da0e2d20e35e84b23
parentce2bdcedf549b2d83ae9df23a3fa0188b33327b7
ZTS: Minimize udev_wait in zvol_misc tests

The zvol_misc tests, in particular zvol_misc_volmode, make use of a
common udev_wait function to wait for zvol devices in /dev to quiesce
on Linux.  On other platforms this function currently only sleeps for
one second before returning.  This is insufficient, and
zvol_misc_volmode has been flaky on FreeBSD as a result.

Replace udev_wait with block_device_wait, passing through the optional
device parameter where possible.  Rearrange a few checks to strengthen
the verifications we are making and avoid unnecessarily sleeping.  We
must keep udev_wait in a couple places to pass in Github CI workflows.
Remove zvol_misc_volmode from the maybe failing tests on FreeBSD in
zts-report.py.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #12583
tests/test-runner/bin/zts-report.py.in
tests/zfs-tests/include/blkdev.shlib
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_common.kshlib
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_rename_inuse.ksh
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_snapdev.ksh
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_volmode.ksh
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_zil.ksh