fstests: use udevadm wait in preference to settle

When running lots of tests in parallel, there are lots of
filesystems and block devices changing state. This generates a lot
of udev events when means the udev event queue is rarely empty.
Unfortunately, an empty event queue is what udev settling waits
upon. Hence calling UDEV_SETTLE_PROG can mean waiting for a lot of
time for other tests to stop generating udev events.

For the majority of cases, what we care about is that udev has
performed device node addition or removal, not that there are no
udev events pending. Recent(-ish) systemd releases support 'udevadm
wait' to wait for a specific file to be created or unlinked rather
than waiting for the event that does that work to be completed.

Hence we don't have to wait for the udev event queue to empty,
just for the udev event that does the device node manipulation to
complete.

Introduce detection of 'udevadm wait' support and a _udev_wait()
wrapper function to use it if it is available. If it isn't, the use
the existing UDEV_SETTLE_PROG behaviour.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Zorro lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/common/config b/common/config
index fcff0660b05a97b0b9e670369ec48bf7e43d3a70..70907cd3daba61e9f2a92d1fb820b3743245f569 100644 (file)
--- a/common/config
+++ b/common/config
@@ -236,18 +236,30 @@ export BTRFS_MAP_LOGICAL_PROG=$(type -P btrfs-map-logical)
 export PARTED_PROG="$(type -P parted)"
 export XFS_PROPERTY_PROG="$(type -P xfs_property)"
 
-# use 'udevadm settle' or 'udevsettle' to wait for lv to be settled.
-# newer systems have udevadm command but older systems like RHEL5 don't.
-# But if neither one is available, just set it to "sleep 1" to wait for lv to
-# be settled
-UDEV_SETTLE_PROG="$(type -P udevadm)"
-if [ "$UDEV_SETTLE_PROG" == "" ]; then
-       # try udevsettle command
+# udev wait functions.
+#
+# This is how we wait for udev to create or remove device nodes after running a
+# device create/remove command for logical volumes (e.g. lvm or dm).
+#
+# We can wait for the udev queue to empty via "settling". This, however, has
+# major issues when running tests in parallel - the udev queue takes a long time
+# to reach empty state. Hence if we have udev > 2.51 installed we use device
+# waiting instead. This waits for the device node to appear/disappear rather
+# than waiting for the udev queue to empty.
+#
+# If none of these methods are available, fall back to a simple delay (sleep 1)
+# and hope this is sufficient.
+UDEVADM_PROG="$(type -P udevadm)"
+if [ -z "$UDEVADM_PROG" ]; then
        UDEV_SETTLE_PROG="$(type -P udevsettle)"
 else
-       # udevadm is available, add 'settle' as subcommand
-       UDEV_SETTLE_PROG="$UDEV_SETTLE_PROG settle"
+       UDEV_SETTLE_PROG="$UDEVADM_PROG settle"
+       $UDEVADM_PROG help | grep -q "Wait for device or device symlink"
+       if [ $? -eq 0 ]; then
+               UDEV_WAIT_PROG="$UDEVADM_PROG wait"
+       fi
 fi
+
 # neither command is available, use sleep 1
 #
 # Udev events are sent via netlink to userspace through
@@ -258,8 +270,11 @@ fi
 # exist or always be 0. We check for /proc/net to see CONFIG_NET was enabled.
 if [[ "$UDEV_SETTLE_PROG" == "" || ! -d /proc/net ]]; then
        UDEV_SETTLE_PROG="sleep 1"
+       unset UDEV_WAIT_PROG
 fi
 export UDEV_SETTLE_PROG
+export UDEVADM_PROG
+export UDEV_WAIT_PROG
 
 # Set MODPROBE_PATIENT_RM_TIMEOUT_SECONDS to "forever" if you want the patient
 # modprobe removal to run forever trying to remove a module.

diff --git a/common/rc b/common/rc
index 393ad859ea50c6ea63c4bab10753a53daff68574..b7f885fb80a6e8260cf2d737ea60045122e9ba11 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -5218,22 +5218,29 @@ _require_label_get_max()
        dummy=$(_label_get_max)
 }
 
+_udev_wait()
+{
+       local args="$*"
+
+       if [ -z "$UDEV_WAIT_PROG" ]; then
+               $UDEV_SETTLE_PROG >/dev/null 2>&1
+       else
+               $UDEV_WAIT_PROG $args
+       fi
+}
+
 _dmsetup_remove()
 {
-       $UDEV_SETTLE_PROG >/dev/null 2>&1
-       $DMSETUP_PROG remove --retry "$@" >>$seqres.full 2>&1
-       $UDEV_SETTLE_PROG >/dev/null 2>&1
+       [ $# -le 0 ] && return
+
+       $DMSETUP_PROG remove --deferred "$@" >>$seqres.full 2>&1
+       _udev_wait --removed /dev/mapper/$1
 }
 
 _dmsetup_create()
 {
-       # Wait for udev to settle so that the dm creation doesn't fail because
-       # some udev subprogram opened one of the block devices mentioned in the
-       # table string w/ O_EXCL.  Do it again at the end so that an immediate
-       # device open won't also fail.
-       $UDEV_SETTLE_PROG >/dev/null 2>&1
        $DMSETUP_PROG create "$@" >>$seqres.full 2>&1 || return 1
-       $UDEV_SETTLE_PROG >/dev/null 2>&1
+       _udev_wait /dev/mapper/$1
 }
 
 _require_btime()

diff --git a/tests/btrfs/291 b/tests/btrfs/291
index c31de3a96ef1f5c07ed014b36e8e7abb9d8a7c81..122aeaa5d89c864c7a3e550ecebf722ebf17dd4a 100755 (executable)
--- a/tests/btrfs/291
+++ b/tests/btrfs/291
@@ -21,6 +21,7 @@ _cleanup()
        cd /
        _log_writes_cleanup &> /dev/null
        $LVM_PROG vgremove -f -y $vgname >>$seqres.full 2>&1
+       _udev_wait --removed /dev/mapper/$vgname-$lvname
        losetup -d $loop_dev >>$seqres.full 2>&1
        rm -f $img
        _restore_fsverity_signatures
@@ -106,7 +107,7 @@ snap_dev=/dev/mapper/vg_replay-$snapname
 $LVM_PROG vgcreate -f $vgname $loop_dev >>$seqres.full 2>&1 || _fail "failed to vgcreate $vgname"
 $LVM_PROG lvcreate -L "$replay_bytes"B -n $lvname $vgname -y >>$seqres.full 2>&1 || \
        _fail "failed to lvcreate $lvname"
-$UDEV_SETTLE_PROG >>$seqres.full 2>&1
+_udev_wait /dev/mapper/$vgname-$lvname
 
 replay_log_prog=$here/src/log-writes/replay-log
 num_entries=$($replay_log_prog --log $LOGWRITES_DEV --num-entries)
@@ -125,7 +126,7 @@ do
 
        $LVM_PROG lvcreate -s -L 4M -n $snapname $vgname/$lvname >>$seqres.full 2>&1 || \
                _fail "Failed to create snapshot"
-       $UDEV_SETTLE_PROG >>$seqres.full 2>&1
+       _udev_wait /dev/mapper/$vgname-$snapname
 
        orphan=$(count_item $snap_dev ORPHAN)
        [ $state -eq 0 ] && [ $orphan -gt 0 ] && state=1

diff --git a/tests/generic/081 b/tests/generic/081
index df17ab6c1de63771fb85eb3a6d28377e04da212a..37137d937b05ef8f84a10dab293900b8ad49d764 100755 (executable)
--- a/tests/generic/081
+++ b/tests/generic/081
@@ -38,7 +38,7 @@ _cleanup()
                $LVM_PROG vgremove -f $vgname >>$seqres.full 2>&1
                $LVM_PROG pvremove -f $SCRATCH_DEV >>$seqres.full 2>&1
                pv_ret=$?
-               $UDEV_SETTLE_PROG
+               _udev_wait --removed /dev/mapper/$vgname-$lvname
                test $pv_ret -eq 0 && break
                sleep 2
        done
@@ -70,8 +70,8 @@ $LVM_PROG vgcreate -f $vgname $SCRATCH_DEV >>$seqres.full 2>&1
 # We use yes pipe instead of 'lvcreate --yes' because old version of lvm
 # (like 2.02.95 in RHEL6) don't support --yes option
 yes | $LVM_PROG lvcreate -L ${lvsize}M -n $lvname $vgname >>$seqres.full 2>&1
-# wait for lvcreation to fully complete
-$UDEV_SETTLE_PROG >>$seqres.full 2>&1
+_udev_wait /dev/mapper/$vgname-$lvname
+
 
 # _mkfs_dev exits the test on failure, this can make sure lv is created in
 # above vgcreate/lvcreate steps

diff --git a/tests/generic/108 b/tests/generic/108
index 2709472f61babed01f3bfb5acee51f5195a35263..f630450ec66dfbbfd99323297390799157553ee4 100755 (executable)
--- a/tests/generic/108
+++ b/tests/generic/108
@@ -20,8 +20,8 @@ _cleanup()
        echo running > /sys/block/`_short_dev $SCSI_DEBUG_DEV`/device/state
        _unmount $SCRATCH_MNT >>$seqres.full 2>&1
        $LVM_PROG vgremove -f $vgname >>$seqres.full 2>&1
-       $LVM_PROG pvremove -f $SCRATCH_DEV $SCSI_DEBUG_DEV >>$seqres.full 2>&1
-       $UDEV_SETTLE_PROG
+        pvremove -f $SCRATCH_DEV $SCSI_DEBUG_DEV >>$seqres.full 2>&1
+       _udev_wait --removed /dev/mapper/$vgname-$lvname
        _put_scsi_debug_dev
        rm -f $tmp.*
 }
@@ -57,8 +57,7 @@ $LVM_PROG vgcreate -f $vgname $SCSI_DEBUG_DEV $SCRATCH_DEV >>$seqres.full 2>&1
 # (like 2.02.95 in RHEL6) don't support --yes option
 yes | $LVM_PROG lvcreate -i 2 -I 4m -L ${lvsize}m -n $lvname $vgname \
        >>$seqres.full 2>&1
-# wait for lv creation to fully complete
-$UDEV_SETTLE_PROG >>$seqres.full 2>&1
+_udev_wait /dev/mapper/$vgname-$lvname
 
 # _mkfs_dev exits the test on failure, this makes sure test lv is created by
 # above vgcreate/lvcreate operations

diff --git a/tests/generic/459 b/tests/generic/459
index 905c404ccbbe69eacfca30d6edacba6ac1ea781c..40c87e20f8b9b10b4f3105cd0dc8a6681fffb25e 100755 (executable)
--- a/tests/generic/459
+++ b/tests/generic/459
@@ -31,7 +31,7 @@ _cleanup()
        _unmount $SCRATCH_MNT >>$seqres.full 2>&1
        $LVM_PROG vgremove -ff $vgname >>$seqres.full 2>&1
        $LVM_PROG pvremove -ff $SCRATCH_DEV >>$seqres.full 2>&1
-       $UDEV_SETTLE_PROG
+       _udev_wait --removed /dev/mapper/$vgname-$lvname
 }
 
 # Import common functions.
@@ -95,8 +95,7 @@ $LVM_PROG lvcreate  --thinpool $poolname  --errorwhenfull y \
 $LVM_PROG lvcreate  --virtualsize $virtsize \
                    -T $vgname/$poolname \
                    -n $lvname >>$seqres.full 2>&1
-
-$UDEV_SETTLE_PROG &>/dev/null
+_udev_wait /dev/mapper/$vgname-$lvname
 _mkfs_dev /dev/mapper/$vgname-$lvname >>$seqres.full 2>&1
 
 # Running the test over the original volume doesn't reproduce the problem
@@ -104,6 +103,7 @@ _mkfs_dev /dev/mapper/$vgname-$lvname >>$seqres.full 2>&1
 # reproducible, so, create a snapshot and run the test over it.
 $LVM_PROG lvcreate  -k n -s $vgname/$lvname \
                    -n $snapname >>$seqres.full 2>&1
+_udev_wait /dev/mapper/$vgname-$snapname
 
 # Catch mount failure so we don't blindly go an freeze the root filesystem
 # instead of lvm volume.