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>

diff --cc qa/workunits/rbd/rbd_mirror.sh
index 19337317e23858d712d3e3107371f02352c955e3,8e69f2d0ee526d7fddf604d5fa266b58439937a8..fcfae98004d6302ec98c720b4918176ad689fdf5
--- 1/qa/workunits/rbd/rbd_mirror.sh
--- 2/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

diff --cc qa/workunits/rbd/rbd_mirror_helpers.sh
Simple merge

diff --cc src/librbd/internal.cc
Simple merge