From: Mykola Golub <mgolub@suse.com>
Date: Tue, 18 Jun 2019 11:04:59 +0000 (+0100)
Subject: qa/workunits/rbd: tweak mirror tests
X-Git-Tag: v15.1.0~2423^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c99e26eff920d851d5e94b5f04659144d25d2540;p=ceph.git

qa/workunits/rbd: tweak mirror tests

(after "image mirror disable" started to disable journaling)

Signed-off-by: Mykola Golub <mgolub@suse.com>
---

diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh
index 80d7b5deafd..2a69347544f 100755
--- a/qa/workunits/rbd/rbd_mirror.sh
+++ b/qa/workunits/rbd/rbd_mirror.sh
@@ -298,6 +298,7 @@ done
 
 set_pool_mirror_mode ${CLUSTER2} ${POOL} 'pool'
 for i in ${image2} ${image4}; do
+  enable_journaling ${CLUSTER2} ${POOL} ${i}
   wait_for_image_present ${CLUSTER1} ${POOL} ${i} 'present'
   wait_for_snap_present ${CLUSTER1} ${POOL} ${i} 'snap2'
   wait_for_image_replay_started ${CLUSTER1} ${POOL} ${i}
@@ -324,6 +325,7 @@ fi
 start_mirrors ${CLUSTER1}
 wait_for_image_present ${CLUSTER1} ${POOL} ${image} 'deleted'
 set_pool_mirror_mode ${CLUSTER2} ${POOL} 'pool'
+enable_journaling ${CLUSTER2} ${POOL} ${image}
 wait_for_image_present ${CLUSTER1} ${POOL} ${image} 'present'
 wait_for_image_replay_started ${CLUSTER1} ${POOL} ${image}
 
diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh
index 5317bc06b42..8f560689ef2 100755
--- a/qa/workunits/rbd/rbd_mirror_helpers.sh
+++ b/qa/workunits/rbd/rbd_mirror_helpers.sh
@@ -731,6 +731,15 @@ create_image()
 	--image-feature layering,exclusive-lock,journaling $@ ${image}
 }
 
+enable_journaling()
+{
+    local cluster=$1
+    local pool=$2
+    local image=$3
+
+    rbd --cluster ${cluster} -p ${pool} feature enable ${image} journaling
+}
+
 set_image_meta()
 {
     local cluster=$1