From: Loic Dachary <loic@dachary.org>
Date: Mon, 17 Oct 2016 15:37:06 +0000 (+0200)
Subject: Merge pull request #10650 from dachary/wip-16868-jewel
X-Git-Tag: v10.2.4~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee32be2ae3c328238fd2bbb953c18d3b9f0a51b1;p=ceph.git

Merge pull request #10650 from dachary/wip-16868-jewel

jewel: Prevent the creation of a clone from a non-primary mirrored image

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

ee32be2ae3c328238fd2bbb953c18d3b9f0a51b1
diff --cc qa/workunits/rbd/rbd_mirror.sh
index 19337317e238,8e69f2d0ee52..fcfae98004d6
--- a/qa/workunits/rbd/rbd_mirror.sh
+++ b/qa/workunits/rbd/rbd_mirror.sh
@@@ -168,9 -138,12 +168,12 @@@ compare_images ${PARENT_POOL} ${parent_
  
  wait_for_image_replay_started ${CLUSTER1} ${POOL} ${clone_image}
  wait_for_replay_complete ${CLUSTER1} ${CLUSTER2} ${POOL} ${clone_image}
 -test_status_in_pool_dir ${CLUSTER1} ${POOL} ${clone_image} 'up+replaying' 'master_position'
 +wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${clone_image} 'up+replaying' 'master_position'
  compare_images ${POOL} ${clone_image}
  
+ expect_failure "is non-primary" clone_image ${CLUSTER1} ${PARENT_POOL} \
+     ${parent_image} ${parent_snap} ${POOL} ${clone_image}1
+ 
  testlog "TEST: disable mirroring / delete non-primary image"
  image2=test2
  image3=test3