From: Jason Dillaman <dillaman@redhat.com>
Date: Sun, 3 Apr 2016 14:29:38 +0000 (-0400)
Subject: qa/workunits/rbd: qemu tests need to wait for image to be created
X-Git-Tag: v10.1.1~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8425%2Fhead;p=ceph.git

qa/workunits/rbd: qemu tests need to wait for image to be created

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/workunits/rbd/qemu_dynamic_features.sh b/qa/workunits/rbd/qemu_dynamic_features.sh
index 50ba645ed6b..3bb1fe29890 100755
--- a/qa/workunits/rbd/qemu_dynamic_features.sh
+++ b/qa/workunits/rbd/qemu_dynamic_features.sh
@@ -16,12 +16,12 @@ wait_for_qemu() {
   done
 }
 
+wait_for_qemu
 rbd feature disable ${IMAGE_NAME} journaling || true
 rbd feature disable ${IMAGE_NAME} fast-diff || true
 rbd feature disable ${IMAGE_NAME} object-map || true
 rbd feature disable ${IMAGE_NAME} exclusive-lock || true
 
-wait_for_qemu
 while is_qemu_running ; do
   echo "*** Enabling all features"
   rbd feature enable ${IMAGE_NAME} exclusive-lock
diff --git a/qa/workunits/rbd/qemu_rebuild_object_map.sh b/qa/workunits/rbd/qemu_rebuild_object_map.sh
index 5e583025754..338c56c3877 100755
--- a/qa/workunits/rbd/qemu_rebuild_object_map.sh
+++ b/qa/workunits/rbd/qemu_rebuild_object_map.sh
@@ -16,6 +16,7 @@ wait_for_qemu() {
   done
 }
 
+wait_for_qemu
 rbd feature disable ${IMAGE_NAME} journaling || true
 rbd feature disable ${IMAGE_NAME} fast-diff || true
 rbd feature disable ${IMAGE_NAME} object-map || true
@@ -24,7 +25,6 @@ rbd feature disable ${IMAGE_NAME} exclusive-lock || true
 rbd feature enable ${IMAGE_NAME} exclusive-lock
 rbd feature enable ${IMAGE_NAME} object-map
 
-wait_for_qemu
 while is_qemu_running ; do
   echo "*** Rebuilding object map"
   rbd object-map rebuild ${IMAGE_NAME}