Call 'udevadm settle' or 'udevsettle' or 'sleep 1' to make sure new lv is ready for use before making filesystem on it, depends on which command is available on the system. Signed-off-by: Eryu Guan <eguan@xxxxxxxxxx> --- v3: - add fsync command back and no 'sleep 1' in cleanup either v2: - move UDEV_SETTLE_PROG setup code to common/config - remove fsync from xfs_io command - update comments a bit about waiting for lv creation common/config | 18 ++++++++++++++++++ tests/generic/081 | 2 ++ 2 files changed, 20 insertions(+) diff --git a/common/config b/common/config index 3732287..b7991ed 100644 --- a/common/config +++ b/common/config @@ -192,6 +192,24 @@ export DUMP_PROG="`set_prog_path dump`" export RESTORE_PROG="`set_prog_path restore`" export LVM_PROG="`set_prog_path lvm`" +# 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="`set_prog_path udevadm`" +if [ "$UDEV_SETTLE_PROG" == "" ]; then + # try udevsettle command + UDEV_SETTLE_PROG="`set_prog_path udevsettle`" +else + # udevadm is available, add 'settle' as subcommand + UDEV_SETTLE_PROG="$UDEV_SETTLE_PROG settle" +fi +# neither command is available, use sleep 1 +if [ "$UDEV_SETTLE_PROG" == "" ]; then + UDEV_SETTLE_PROG="sleep 1" +fi +export UDEV_SETTLE_PROG + # Generate a comparable xfsprogs version number in the form of # major * 10000 + minor * 100 + release # diff --git a/tests/generic/081 b/tests/generic/081 index 5d38c11..34da1ac 100755 --- a/tests/generic/081 +++ b/tests/generic/081 @@ -66,6 +66,8 @@ mkdir -p $mnt _scratch_mkfs_sized $((300 * 1024 * 1024)) >>$seqres.full 2>&1 $LVM_PROG vgcreate -f $vgname $SCRATCH_DEV >>$seqres.full 2>&1 $LVM_PROG lvcreate --yes -L 256M -n $lvname $vgname >>$seqres.full 2>&1 +# wait for lvcreation to fully complete +$UDEV_SETTLE_PROG >>$seqres.full 2>&1 # _mkfs_dev exits the test on failure, this can make sure lv is created in # above vgcreate/lvcreate steps -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
