From: Dongsheng Yang <dongsheng.yang@easystack.cn>
Date: Sat, 12 Mar 2016 11:47:48 +0000 (-0500)
Subject: mds: change the 'fs remove_data_pool' to 'fs rm_data_pool'
X-Git-Tag: v10.1.0~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28982cad9b08526ca7d1f3f419f3a88a767465fd;p=ceph.git

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 621a9cf57997..53f61b648ffa 100644
--- 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 b032b947fbd6..3e592bd2a8a7 100644
--- 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 de3d93de55fd..ceb38e114bf0 100644
--- 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")