From: Jason Dillaman Date: Thu, 26 May 2016 17:26:57 +0000 (-0400) Subject: qa/workunits/rbd: create secondary replicated pool X-Git-Tag: v10.2.2~41^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f0d89a9258fdf2f7392c63ca5d6488c4e3f210d;p=ceph.git qa/workunits/rbd: create secondary replicated pool Signed-off-by: Jason Dillaman (cherry picked from commit 839544ee6446b959f01290667592e44fc5ee6991) --- diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh index 74b8b8f04485..35b412dab1a8 100755 --- a/qa/workunits/rbd/rbd_mirror.sh +++ b/qa/workunits/rbd/rbd_mirror.sh @@ -63,6 +63,7 @@ CLUSTER1=cluster1 CLUSTER2=cluster2 POOL=mirror +PARENT_POOL=mirror_parent SRC_DIR=$(readlink -f $(dirname $0)/../../../src) TEMPDIR= @@ -134,12 +135,18 @@ setup() ceph --cluster ${CLUSTER1} osd pool create ${POOL} 64 64 ceph --cluster ${CLUSTER2} osd pool create ${POOL} 64 64 + ceph --cluster ${CLUSTER1} osd pool create ${PARENT_POOL} 64 64 + ceph --cluster ${CLUSTER2} osd pool create ${PARENT_POOL} 64 64 rbd --cluster ${CLUSTER1} mirror pool enable ${POOL} pool rbd --cluster ${CLUSTER2} mirror pool enable ${POOL} pool + rbd --cluster ${CLUSTER1} mirror pool enable ${PARENT_POOL} image + rbd --cluster ${CLUSTER2} mirror pool enable ${PARENT_POOL} image rbd --cluster ${CLUSTER1} mirror pool peer add ${POOL} ${CLUSTER2} rbd --cluster ${CLUSTER2} mirror pool peer add ${POOL} ${CLUSTER1} + rbd --cluster ${CLUSTER1} mirror pool peer add ${PARENT_POOL} ${CLUSTER2} + rbd --cluster ${CLUSTER2} mirror pool peer add ${PARENT_POOL} ${CLUSTER1} } cleanup() @@ -158,6 +165,8 @@ cleanup() else ceph --cluster ${CLUSTER1} osd pool rm ${POOL} ${POOL} --yes-i-really-really-mean-it ceph --cluster ${CLUSTER2} osd pool rm ${POOL} ${POOL} --yes-i-really-really-mean-it + ceph --cluster ${CLUSTER1} osd pool rm ${PARENT_POOL} ${PARENT_POOL} --yes-i-really-really-mean-it + ceph --cluster ${CLUSTER2} osd pool rm ${PARENT_POOL} ${PARENT_POOL} --yes-i-really-really-mean-it fi rm -Rf ${TEMPDIR} }