osd: introduce command of 'osd tier rm-overlay'

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

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

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index e48f305813deb3ddba79d996635ba9b0a7344b6b..3b3bf1bbd559d6b5fe16396333d77fe50e17eb32 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -808,6 +808,9 @@ COMMAND("osd tier set-overlay " \
 COMMAND("osd tier remove-overlay " \
        "name=pool,type=CephPoolname ", \
        "remove the overlay pool for base pool <pool>", "osd", "rw", "cli,rest")
+COMMAND("osd tier rm-overlay " \
+       "name=pool,type=CephPoolname ", \
+       "remove the overlay pool for base pool <pool>", "osd", "rw", "cli,rest")
 
 COMMAND("osd tier add-cache " \
        "name=pool,type=CephPoolname " \

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c18f659f6889dda176e8b1962f755c59e9f23d0b..63833cab957e753d2b0ffb4fe5f6fcad1e421456 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7209,7 +7209,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-overlay") {
+  } else if (prefix == "osd tier remove-overlay" ||
+             prefix == "osd tier rm-overlay") {
     string poolstr;
     cmd_getval(g_ceph_context, cmdmap, "pool", poolstr);
     int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr);