osd: introduce a command of 'osd pool rm'

introduce command of 'osd pool rm' as an alias of 'osd pool delete'

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

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index bba698706a63f52f97b4612972cb3bdd655c4bca..b8ac28130c7565f9ce12a06ca8d8379cf60aa05f 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -706,6 +706,12 @@ COMMAND("osd pool delete " \
        "name=sure,type=CephChoices,strings=--yes-i-really-really-mean-it,req=false", \
        "delete pool", \
        "osd", "rw", "cli,rest")
+COMMAND("osd pool rm " \
+       "name=pool,type=CephPoolname " \
+       "name=pool2,type=CephPoolname,req=false " \
+       "name=sure,type=CephChoices,strings=--yes-i-really-really-mean-it,req=false", \
+       "remove pool", \
+       "osd", "rw", "cli,rest")
 COMMAND("osd pool rename " \
        "name=srcpool,type=CephPoolname " \
        "name=destpool,type=CephPoolname", \

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 1b280b894251cb70dfa7da0655f2223be744d114..1fec958aa66fe727167ee2b25402811165bd3bb6 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6943,8 +6943,9 @@ done:
                                              get_last_committed() + 1));
     return true;
 
-  } else if (prefix == "osd pool delete") {
-    // osd pool delete <poolname> <poolname again> --yes-i-really-really-mean-it
+  } else if (prefix == "osd pool delete" ||
+             prefix == "osd pool rm") {
+    // osd pool delete/rm <poolname> <poolname again> --yes-i-really-really-mean-it
     string poolstr, poolstr2, sure;
     cmd_getval(g_ceph_context, cmdmap, "pool", poolstr);
     cmd_getval(g_ceph_context, cmdmap, "pool2", poolstr2);