mon: remove dead "cluster_snap" command

This had existed in a disabled state (by having an empty
string for the cli/rest field in the command definition)
for a long time.  Now that that field is gone, we don't
have a concept of "disabled" commands any more, so
let's just clean up this loose end.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index e213f2955886aeb3b10fbd924daf7483fab8d9cf..3877fdaadb7ff2f176919d81c3156e63ee44f002 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -764,8 +764,6 @@ COMMAND("osd require-osd-release "\
        "name=sure,type=CephChoices,strings=--yes-i-really-mean-it,req=false", \
        "set the minimum allowed OSD release to participate in the cluster",
        "osd", "rw")
-COMMAND("osd cluster_snap", "take cluster snapshot (disabled)", \
-       "osd", "r")
 COMMAND("osd down " \
        "type=CephString,name=ids,n=N", \
        "set osd(s) <id> [<id>...] down, " \

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c569765e4243e675453a0ca6444858d9a642f482..4952188b0363148af7a5890ecb1415b341a591f9 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -10118,11 +10118,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
     }
     pending_inc.new_require_osd_release = rel;
     goto update;
-  } else if (prefix == "osd cluster_snap") {
-    // ** DISABLE THIS FOR NOW **
-    ss << "cluster snapshot currently disabled (broken implementation)";
-    // ** DISABLE THIS FOR NOW **
-
   } else if (prefix == "osd down" ||
             prefix == "osd out" ||
             prefix == "osd in" ||

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index dc1cad873bc28aecc9b31e55f49cabde22ae3385..0f7c5cb4ce5b600d5c7fe9a7afbff4a2792b3bde 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -859,9 +859,6 @@ class TestOSD(TestArgparse):
             assert_equal({}, validate_command(sigdict, ['osd', action,
                                                         'pause', 'toomany']))
 
-    def test_cluster_snap(self):
-        assert_equal({}, validate_command(sigdict, ['osd', 'cluster_snap']))
-
     def test_down(self):
         self.check_1_or_more_string_args('osd', 'down')