From: Mykola Golub <mgolub@mirantis.com>
Date: Thu, 12 May 2016 06:15:53 +0000 (+0300)
Subject: qa: dynamic_features.sh: return error only if it failed on alive QEMU
X-Git-Tag: v11.0.0~480^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a71a79d24f2e1f999a5fc0a4154a10401d5a261;p=ceph.git

qa: dynamic_features.sh: return error only if it failed on alive QEMU

Fixes: #15500
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/qa/workunits/rbd/qemu_dynamic_features.sh b/qa/workunits/rbd/qemu_dynamic_features.sh
index 4838ff3b65e4..f237f6637626 100755
--- a/qa/workunits/rbd/qemu_dynamic_features.sh
+++ b/qa/workunits/rbd/qemu_dynamic_features.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -x
 
 if [[ -z "${IMAGE_NAME}" ]]; then
   echo image name must be provided
@@ -17,28 +17,32 @@ wait_for_qemu() {
 }
 
 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
+rbd feature disable ${IMAGE_NAME} journaling
+rbd feature disable ${IMAGE_NAME} fast-diff
+rbd feature disable ${IMAGE_NAME} object-map
+rbd feature disable ${IMAGE_NAME} exclusive-lock
 
 while is_qemu_running ; do
   echo "*** Enabling all features"
-  rbd feature enable ${IMAGE_NAME} exclusive-lock
-  rbd feature enable ${IMAGE_NAME} journaling
-  rbd feature enable ${IMAGE_NAME} object-map
-  rbd feature enable ${IMAGE_NAME} fast-diff
+  rbd feature enable ${IMAGE_NAME} exclusive-lock || break
+  rbd feature enable ${IMAGE_NAME} journaling || break
+  rbd feature enable ${IMAGE_NAME} object-map || break
+  rbd feature enable ${IMAGE_NAME} fast-diff || break
   if is_qemu_running ; then
     sleep 60
   fi
 
   echo "*** Disabling all features"
-  rbd feature disable ${IMAGE_NAME} journaling
-  rbd feature disable ${IMAGE_NAME} fast-diff
-  rbd feature disable ${IMAGE_NAME} object-map
-  rbd feature disable ${IMAGE_NAME} exclusive-lock
+  rbd feature disable ${IMAGE_NAME} journaling || break
+  rbd feature disable ${IMAGE_NAME} fast-diff || break
+  rbd feature disable ${IMAGE_NAME} object-map || break
+  rbd feature disable ${IMAGE_NAME} exclusive-lock || break
   if is_qemu_running ; then
     sleep 60
   fi
 done
 
+if is_qemu_running ; then
+    echo "RBD command failed on alive QEMU"
+    exit 1
+fi