From 009e8746868795271f2642105f7a3164753ed4f2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 22 Apr 2014 09:42:16 -0700 Subject: [PATCH] qa/workunits/rbd/copy.sh: skip some tests when tiering is enabled The rados ls bit doesn't work. Signed-off-by: Sage Weil Reviewed-by: Josh Durgin --- qa/workunits/rbd/copy.sh | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/qa/workunits/rbd/copy.sh b/qa/workunits/rbd/copy.sh index 59824f9245bff..27a1789c07a07 100755 --- a/qa/workunits/rbd/copy.sh +++ b/qa/workunits/rbd/copy.sh @@ -5,6 +5,11 @@ rbd ls | wc -l | grep -v '^0$' && echo "nonempty rbd pool, aborting! run this s IMGS="testimg1 testimg2 testimg3 foo foo2 bar bar2 test1 test2 test3 clone2" +tiered=0 +if ceph osd dump | grep ^pool | grep "'rbd'" | grep tier; then + tiered=1 +fi + remove_images() { for img in $IMGS do @@ -177,20 +182,22 @@ test_remove() { rbd rm test1 rbd ls | wc -l | grep "^0$" - # remove with header missing - rbd create --new-format -s 1 test2 - HEADER=$(rados -p rbd ls | grep '^rbd_header') - rados -p rbd rm $HEADER - rbd rm test2 - rbd ls | wc -l | grep "^0$" - - # remove with header and id missing - rbd create --new-format -s 1 test2 - HEADER=$(rados -p rbd ls | grep '^rbd_header') - rados -p rbd rm $HEADER - rados -p rbd rm rbd_id.test2 - rbd rm test2 - rbd ls | wc -l | grep "^0$" + if [ $tiered -eq 0 ]; then + # remove with header missing + rbd create --new-format -s 1 test2 + HEADER=$(rados -p rbd ls | grep '^rbd_header') + rados -p rbd rm $HEADER + rbd rm test2 + rbd ls | wc -l | grep "^0$" + + # remove with header and id missing + rbd create --new-format -s 1 test2 + HEADER=$(rados -p rbd ls | grep '^rbd_header') + rados -p rbd rm $HEADER + rados -p rbd rm rbd_id.test2 + rbd rm test2 + rbd ls | wc -l | grep "^0$" + fi # remove with rbd_children object missing (and, by extension, # with child not mentioned in rbd_children) -- 2.39.5