summaryrefslogtreecommitdiff
path: root/qa/workunits
diff options
context:
space:
mode:
Diffstat (limited to 'qa/workunits')
-rwxr-xr-xqa/workunits/cephtool/test.sh2
-rwxr-xr-xqa/workunits/misc/mkpool_layout_vxattrs.sh8
2 files changed, 7 insertions, 3 deletions
diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 09e55b9a842..338bde5700c 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -147,7 +147,9 @@ ceph mds newfs 0 1 --yes-i-really-mean-it
ceph osd pool create data2 10
poolnum=$(ceph osd dump | grep 'pool.*data2' | awk '{print $2;}')
ceph mds add_data_pool $poolnum
+ceph mds add_data_pool rbd
ceph mds remove_data_pool $poolnum
+ceph mds remove_data_pool rbd
ceph osd pool delete data2 data2 --yes-i-really-really-mean-it
ceph mds set_max_mds 4
ceph mds set_max_mds 3
diff --git a/qa/workunits/misc/mkpool_layout_vxattrs.sh b/qa/workunits/misc/mkpool_layout_vxattrs.sh
index 16b3cdfe517..91d31664898 100755
--- a/qa/workunits/misc/mkpool_layout_vxattrs.sh
+++ b/qa/workunits/misc/mkpool_layout_vxattrs.sh
@@ -4,10 +4,12 @@ set -e
touch foo.$$
rados mkpool foo.$$
-poolid=$(ceph osd dump | grep "^pool" | awk '{print $2}' | tail -n 1)
-ceph mds add_data_pool ${poolid}
+ceph mds add_data_pool foo.$$
setfattr -n ceph.file.layout.pool -v foo.$$ foo.$$
# cleanup
-rados rmpool foo.$$ foo.$$ --yes-i-really-really-mean-it
rm foo.$$
+ceph mds remove_data_pool foo.$$
+rados rmpool foo.$$ foo.$$ --yes-i-really-really-mean-it
+
+echo OK