mds: change the 'fs remove_data_pool' to 'fs rm_data_pool'

As 'fs remove_data_pool' is newly introduced command, let's
change it to 'fs rm_data_pool' immediately rather than introduce
another alias for it.

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>

diff --git a/doc/cephfs/administration.rst b/doc/cephfs/administration.rst
index 621a9cf57997dc8981d28b0046d2091eeb563665..53f61b648ffa4d8eafb83e19e8ea2382b7648264 100644 (file)
--- a/doc/cephfs/administration.rst
+++ b/doc/cephfs/administration.rst
@@ -39,7 +39,7 @@ creation of multiple filesystems use ``ceph fs flag set enable_multiple true``.
 
 ::
 
-    fs remove_data_pool <filesystem name> <pool name/id>
+    fs rm_data_pool <filesystem name> <pool name/id>
 
 
 Daemons

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index b032b947fbd68128bf687cee8940669eea271fb2..3e592bd2a8a7145b5489b5c12d0427a6002cad11 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1979,7 +1979,7 @@ class RemoveDataPoolHandler : public FileSystemCommandHandler
 {
   public:
   RemoveDataPoolHandler()
-    : FileSystemCommandHandler("fs remove_data_pool")
+    : FileSystemCommandHandler("fs rm_data_pool")
   {}
 
   int handle(

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index de3d93de55fdb6a50dbb6bdabb540a2e3c3570de..ceb38e114bf0280f3a6abf24465ccf3ee9bbfbeb 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -412,7 +412,7 @@ COMMAND("fs flag set name=flag_name,type=CephChoices,strings=enable_multiple "
 COMMAND("fs add_data_pool name=fs_name,type=CephString " \
        "name=pool,type=CephString", \
        "add data pool <pool>", "mds", "rw", "cli,rest")
-COMMAND("fs remove_data_pool name=fs_name,type=CephString " \
+COMMAND("fs rm_data_pool name=fs_name,type=CephString " \
        "name=pool,type=CephString", \
        "remove data pool <pool>", "mds", "rw", "cli,rest")