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 b8ac28130c7565f9ce12a06ca8d8379cf60aa05f..e48f305813deb3ddba79d996635ba9b0a7344b6b 100644 (file)
--- 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 1fec958aa66fe727167ee2b25402811165bd3bb6..c18f659f6889dda176e8b1962f755c59e9f23d0b 100644 (file)
--- 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);