From: John Spray <john.spray@redhat.com>
Date: Tue, 9 Oct 2018 13:09:56 +0000 (-0400)
Subject: mon: remove dead "cluster_snap" command
X-Git-Tag: v14.1.0~969^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc7a12f78c11399ac1c8c45058ccf9a7b9181f84;p=ceph.git

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 e213f2955886..3877fdaadb7f 100644
--- 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 c569765e4243..4952188b0363 100644
--- 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 dc1cad873bc2..0f7c5cb4ce5b 100755
--- 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')