Skip to content

Commit 44804a3

Browse files
committed
qa/workunits/rbd: use create_image_and_enable_mirror() in bootstrap tests
The reason create_image() + enable_mirror() happens to work for PARENT_POOL is that PARENT_POOL is enabled for mirroring in image mode unconditionally, unlike POOL, POOL/NS1 or PARENT_POOL/NS1 for which MIRROR_POOL_MODE setting is respected. This isn't immediately obvious because it's done in setup_pools() in rbd_mirror_helpers.sh. Switch to create_image_and_enable_mirror() for clarity. Signed-off-by: Ilya Dryomov <[email protected]>
1 parent 774016b commit 44804a3

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

qa/workunits/rbd/rbd_mirror_bootstrap.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,8 @@ testlog "TEST: verify rx-tx direction"
6262
rbd --cluster ${CLUSTER1} --pool ${PARENT_POOL} mirror pool info --format json | jq -e '.peers[0].direction == "rx-tx"'
6363
rbd --cluster ${CLUSTER2} --pool ${PARENT_POOL} mirror pool info --format json | jq -e '.peers[0].direction == "rx-tx"'
6464

65-
create_image ${CLUSTER1} ${PARENT_POOL} image1
66-
create_image ${CLUSTER2} ${PARENT_POOL} image2
67-
68-
enable_mirror ${CLUSTER1} ${PARENT_POOL} image1
69-
enable_mirror ${CLUSTER2} ${PARENT_POOL} image2
70-
65+
create_image_and_enable_mirror ${CLUSTER1} ${PARENT_POOL} image1
66+
create_image_and_enable_mirror ${CLUSTER2} ${PARENT_POOL} image2
7167
create_image_and_enable_mirror ${CLUSTER1} ${PARENT_POOL}/${NS1} image1
7268
create_image_and_enable_mirror ${CLUSTER2} ${PARENT_POOL}/${NS1} image2
7369

0 commit comments

Comments
 (0)