ceph-helpers: Delete remaining subvolumes on destroy_osd()

Before deleting $dir/$id, we have to delete the associated subvolumes unless the
rm will fail.

Signed-off-by: Erwan Velu <erwan@redhat.com>

diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
index d53837edb97cd7ba1750ea785e897e17b60bc5b0..759da393293350edce8f899b25019bec0b8ea09e 100755 (executable)
--- a/qa/workunits/ceph-helpers.sh
+++ b/qa/workunits/ceph-helpers.sh
@@ -471,6 +471,7 @@ function destroy_osd() {
     ceph auth del osd.$id || return 1
     ceph osd crush remove osd.$id || return 1
     ceph osd rm $id || return 1
+    teardown $dir/$id || return 1
     rm -fr $dir/$id
 }