From: Dongsheng Yang <dongsheng.yang@easystack.cn>
Date: Fri, 11 Mar 2016 07:40:18 +0000 (-0500)
Subject: osd: introduce command of 'osd tier rm'
X-Git-Tag: v10.1.0~40^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2b297a4a1cd6f1a81b037d32297fa66d1d18c9e;p=ceph.git

osd: introduce command of 'osd tier rm'

introduce command of 'osd tier rm' as an alias of 'osd tier remove'

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

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index b8ac28130c7..e48f305813d 100644
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -792,6 +792,11 @@ COMMAND("osd tier remove " \
 	"name=tierpool,type=CephPoolname",
 	"remove the tier <tierpool> (the second one) from base pool <pool> (the first one)", \
 	"osd", "rw", "cli,rest")
+COMMAND("osd tier rm " \
+	"name=pool,type=CephPoolname " \
+	"name=tierpool,type=CephPoolname",
+	"remove the tier <tierpool> (the second one) from base pool <pool> (the first one)", \
+	"osd", "rw", "cli,rest")
 COMMAND("osd tier cache-mode " \
 	"name=pool,type=CephPoolname " \
 	"name=mode,type=CephChoices,strings=none|writeback|forward|readonly|readforward|readproxy", \
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 1fec958aa66..c18f659f688 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7094,7 +7094,8 @@ done:
     wait_for_finished_proposal(op, new Monitor::C_Command(mon, op, 0, ss.str(),
 					      get_last_committed() + 1));
     return true;
-  } else if (prefix == "osd tier remove") {
+  } else if (prefix == "osd tier remove" ||
+             prefix == "osd tier rm") {
     string poolstr;
     cmd_getval(g_ceph_context, cmdmap, "pool", poolstr);
     int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr);