qa: use fs rm_data_pool

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/doc/cephfs/administration.rst b/doc/cephfs/administration.rst
index 175dde8f9ebc71f932c1e4df34fe43a5ee1bef7c..bcba78de3754b214a913eb229f34c5acb1d4d4bf 100644 (file)
--- a/doc/cephfs/administration.rst
+++ b/doc/cephfs/administration.rst
@@ -189,7 +189,7 @@ These legacy commands are obsolete and no longer usable post-Luminous.
     mds dump  # replaced by "fs get"
     mds getmap # replaced by "fs dump"
     mds newfs # replaced by "fs new"
-    mds remove_data_pool # replaced by "fs remove_data_pool"
+    mds remove_data_pool # replaced by "fs rm_data_pool"
     mds set # replaced by "fs set"
     mds set_max_mds # replaced by "fs set max_mds"
     mds stop  # replaced by "mds deactivate"

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index fdb12ac1c902e8bcfde871cf81ea522b245bd73f..5b9b43f210f95ec2d1cc966eb3dc388a89109eb3 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -926,8 +926,8 @@ function test_mon_mds()
   check_response "Error ENOENT"
   ceph fs add_data_pool cephfs foobarbaz >& $TMPFILE || true
   check_response "Error ENOENT"
-  ceph fs remove_data_pool cephfs $data2_pool
-  ceph fs remove_data_pool cephfs $data3_pool
+  ceph fs rm_data_pool cephfs $data2_pool
+  ceph fs rm_data_pool cephfs $data3_pool
   ceph osd pool delete data2 data2 --yes-i-really-really-mean-it
   ceph osd pool delete data3 data3 --yes-i-really-really-mean-it
   ceph fs set cephfs allow_multimds false

diff --git a/qa/workunits/fs/misc/mkpool_layout_vxattrs.sh b/qa/workunits/fs/misc/mkpool_layout_vxattrs.sh
index 0d543dce8a9eb39dc932ac25bc4a23a259dc12ec..80c0f7bfea1104418d1c486d80c349bdebb82acd 100755 (executable)
--- a/qa/workunits/fs/misc/mkpool_layout_vxattrs.sh
+++ b/qa/workunits/fs/misc/mkpool_layout_vxattrs.sh
@@ -9,7 +9,7 @@ setfattr -n ceph.file.layout.pool -v foo.$$ foo.$$
 
 # cleanup
 rm foo.$$
-ceph fs remove_data_pool cephfs foo.$$
+ceph fs rm_data_pool cephfs foo.$$
 rados rmpool foo.$$ foo.$$ --yes-i-really-really-mean-it
 
 echo OK

diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
index 1d313a1ebbe088ed3253eaab3a58b84a1864d420..b27953d3f95e714345e51bd2589d856304cbe350 100644 (file)
--- a/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@ -727,7 +727,7 @@ class CephFSVolumeClient(object):
             pool_id = self._get_pool_id(osd_map, pool_name)
             mds_map = self.get_mds_map()
             if pool_id in mds_map['data_pools']:
-                self._rados_command("fs {} remove_data_pool".format(mds_map['fs_name']), {
+                self._rados_command("fs {} rm_data_pool".format(mds_map['fs_name']), {
                     'pool': pool_name
                 })
             self._rados_command("osd pool delete",