From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Fri, 28 Jan 2011 16:12:45 +0000 (+0000)
Subject: Replacei sleep wait with udev settle
X-Git-Tag: old-v2_02_83~28
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=2169ecd06395be69dbbb1342d86285e5753299cf;p=lvm2.git

Replacei sleep wait with udev settle

Use new udev_wait command instead of unpredictable sleep waiting.
As with more devices in the system, udev processing is slower.
---

diff --git a/test/t-pvcreate-operation-md.sh b/test/t-pvcreate-operation-md.sh
index a844e32fc..5085ce141 100644
--- a/test/t-pvcreate-operation-md.sh
+++ b/test/t-pvcreate-operation-md.sh
@@ -34,8 +34,9 @@ mdadm_maj=$(mdadm --version 2>&1 | perl -pi -e 's|.* v(\d+).*|\1|')
 cleanup_md() {
     # sleeps offer hack to defeat: 'md: md127 still in use'
     # see: https://bugzilla.redhat.com/show_bug.cgi?id=509908#c25
-    sleep 2
+    aux udev_wait
     mdadm --stop $mddev || true
+    aux udev_wait
     if [ -b "$mddev" ]; then
         # mdadm doesn't always cleanup the device node
 	sleep 2
@@ -102,6 +103,11 @@ EOF
     base_mddev_p=`basename $mddev_p_sysfs_name`
     mddev_p=/dev/${base_mddev_p}
 
+    # in case the system is running without devtmpfs /dev
+    # wait here for created device node on tmpfs
+    aux udev_wait $mddev_p
+    test -b $mddev_p || exit 200
+
     # Checking for 'alignment_offset' in sysfs implies Linux >= 2.6.31
     # but reliable alignment_offset support requires kernel.org Linux >= 2.6.33
     sysfs_alignment_offset=/sys/dev/block/${mddev_maj_min}/${base_mddev_p}/alignment_offset