From: Sage Weil <sage@inktank.com>
Date: Tue, 19 Feb 2013 04:32:41 +0000 (-0800)
Subject: qa: rbd map-snapshot-io: udevadm settle
X-Git-Tag: v0.57~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45a4fe09151bcdeaaa2c3b5dbd089a91deaa055f;p=ceph.git

qa: rbd map-snapshot-io: udevadm settle

Udev runs blkid on device close, thwarting any rbd unmap that
immediately follows use of the device.  Explicitly settle for now.

See #4183.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/qa/workunits/rbd/map-snapshot-io.sh b/qa/workunits/rbd/map-snapshot-io.sh
index 1fb26523e921..b53a81387d4f 100755
--- a/qa/workunits/rbd/map-snapshot-io.sh
+++ b/qa/workunits/rbd/map-snapshot-io.sh
@@ -15,7 +15,14 @@ rbd snap create image@s1
 dd if=/dev/zero of=/dev/rbd/rbd/image oflag=direct count=10   # used to fail
 rbd snap rm image@s1
 dd if=/dev/zero of=/dev/rbd/rbd/image oflag=direct count=10
+
+udevadm settle  # udev is does blkid on device close; yeesh!  see #4183
+
 rbd unmap /dev/rbd/rbd/image
 
+# wait a few seconds for the async kernel bits to clean themselves up
+sleep 4
+rbd rm image || :
+
 echo OK