From: Erwan Velu <erwan@redhat.com>
Date: Thu, 25 Feb 2016 15:01:24 +0000 (+0100)
Subject: ceph-helpers: Delete remaining subvolumes on destroy_osd()
X-Git-Tag: v10.1.0~295^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9ae89269f820c3e61c96f2b37ebc425259050096;p=ceph.git

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 d53837edb97cd..759da39329335 100755
--- 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
 }