summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spray <john.spray@redhat.com>2014-12-02 22:43:03 +0100
committerLoic Dachary <loic@dachary.org>2014-12-03 16:26:57 +0100
commitd98cec7f9c652da570aa2c29558f5651d4a62bdf (patch)
tree840418a9e667e7ba77f50e5ad43afe88639de91a
parentMerge pull request #3067 from dachary/wip-cephtool (diff)
downloadceph-d98cec7f9c652da570aa2c29558f5651d4a62bdf.tar.xz
ceph-d98cec7f9c652da570aa2c29558f5651d4a62bdf.zip
qa: fix teardown in cephtool's test_mon_mds
This was missing from 17b5fc9a but we didn't notice because the test wasn't being run by the gitbuilders. Signed-off-by: John Spray <john.spray@redhat.com>
-rwxr-xr-xqa/workunits/cephtool/test.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index f3bc88faf4f..b87c6259913 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -773,9 +773,14 @@ function test_mon_mds()
ceph osd tier cache-mode mds-tier writeback
ceph osd tier set-overlay fs_metadata mds-tier
+ # Clean up FS
fail_all_mds
ceph fs rm cephfs --yes-i-really-mean-it
+ # Clean up overlay/tier relationship
+ ceph osd tier remove-overlay fs_metadata
+ ceph osd tier remove fs_metadata mds-tier
+
ceph osd pool delete mds-tier mds-tier --yes-i-really-really-mean-it
ceph osd pool delete mds-ec-pool mds-ec-pool --yes-i-really-really-mean-it