From f812199f72bfb7ffa36514fd2154ebe0aeaf6687 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Sun, 3 Apr 2016 10:29:38 -0400 Subject: [PATCH] qa/workunits/rbd: qemu tests need to wait for image to be created Signed-off-by: Jason Dillaman --- qa/workunits/rbd/qemu_dynamic_features.sh | 2 +- qa/workunits/rbd/qemu_rebuild_object_map.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/workunits/rbd/qemu_dynamic_features.sh b/qa/workunits/rbd/qemu_dynamic_features.sh index 50ba645ed6baa..3bb1fe29890d4 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 5e58302575455..338c56c3877cd 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} -- 2.47.3