From: Jason Dillaman Date: Mon, 8 Oct 2018 14:50:32 +0000 (-0400) Subject: qa/workunits/rbd: test new move-to-trash on image remove config override X-Git-Tag: v14.0.1~82^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=97950fec272dd7806e4246e1b2d482a995fef48f;p=ceph.git qa/workunits/rbd: test new move-to-trash on image remove config override Signed-off-by: Jason Dillaman --- diff --git a/qa/workunits/rbd/cli_generic.sh b/qa/workunits/rbd/cli_generic.sh index 3f22893648087..2de7a825c170e 100755 --- a/qa/workunits/rbd/cli_generic.sh +++ b/qa/workunits/rbd/cli_generic.sh @@ -468,6 +468,13 @@ test_trash() { rbd snap purge --image-id $ID rbd snap ls --image-id $ID | grep -v 'SNAPID' | wc -l | grep 0 + rbd rm --rbd_move_to_trash_on_remove=true --rbd_move_to_trash_on_remove_expire_seconds=3600 test1 + rbd trash ls | grep test1 + rbd trash ls | wc -l | grep 1 + rbd trash ls -l | grep 'test1.*USER.*protected until' + rbd trash rm $ID 2>&1 | grep 'Deferment time has not expired' + rbd trash rm --image-id $ID --force + remove_images }