From b0d9b0de152c2d7df73949af23190eff44620e1b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 15 Mar 2016 09:44:04 -0400 Subject: [PATCH] mon: remove 'mds setmap' command This command has no discernable purpose, and is difficult and dangerous to support anyway. Fixes: #15136 Signed-off-by: Sage Weil --- doc/cephfs/administration.rst | 4 ---- doc/man/8/ceph.rst | 8 +------- src/mon/MDSMonitor.cc | 29 --------------------------- src/mon/MonCommands.h | 4 ---- src/test/pybind/test_ceph_argparse.py | 11 ---------- 5 files changed, 1 insertion(+), 55 deletions(-) diff --git a/doc/cephfs/administration.rst b/doc/cephfs/administration.rst index 621a9cf57997d..2f6bb0b29eac8 100644 --- a/doc/cephfs/administration.rst +++ b/doc/cephfs/administration.rst @@ -103,10 +103,6 @@ filesystem. mds compat show -:: - - mds setmap - :: mds getmap diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst index 679963548b6ee..a224d697fe236 100644 --- a/doc/man/8/ceph.rst +++ b/doc/man/8/ceph.rst @@ -33,7 +33,7 @@ Synopsis | **ceph** **log** ** [ **... ] -| **ceph** **mds** [ *add_data_pool* \| *cluster_down* \| *cluster_up* \| *compat* \| *deactivate* \| *dump* \| *fail* \| *getmap* \| *newfs* \| *remove_data_pool* \| *rm* \| *rmfailed* \| *set* \| *set_max_mds* \| *set_state* \| *setmap* \| *stat* \| *stop* \| *tell* ] ... +| **ceph** **mds** [ *add_data_pool* \| *cluster_down* \| *cluster_up* \| *compat* \| *deactivate* \| *dump* \| *fail* \| *getmap* \| *newfs* \| *remove_data_pool* \| *rm* \| *rmfailed* \| *set* \| *set_max_mds* \| *set_state* \| *stat* \| *stop* \| *tell* ] ... | **ceph** **mon** [ *add* \| *dump* \| *getmap* \| *remove* \| *stat* ] ... @@ -433,12 +433,6 @@ Usage:: ceph mds set_state -Subcommand ``setmap`` sets mds map; must supply correct epoch number. - -Usage:: - - ceph mds setmap - Subcommand ``stat`` shows MDS status. Usage:: diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index a680be73c7155..c0440aa1f7cf4 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -2135,35 +2135,6 @@ int MDSMonitor::filesystem_command( info->state = MDSMap::STATE_STOPPING; }); } - } else if (prefix == "mds setmap") { - string confirm; - if (!cmd_getval(g_ceph_context, cmdmap, "confirm", confirm) || - confirm != "--yes-i-really-mean-it") { - ss << "WARNING: this can make your filesystem inaccessible! " - "Add --yes-i-really-mean-it if you are sure you wish to continue."; - return -EINVAL;; - } - - FSMap map; - try { - map.decode(m->get_data()); - } catch(buffer::error &e) { - ss << "invalid mdsmap"; - return -EINVAL; - } - epoch_t e = 0; - int64_t epochnum; - if (cmd_getval(g_ceph_context, cmdmap, "epoch", epochnum)) - e = epochnum; - - if (pending_fsmap.epoch == e) { - map.epoch = pending_fsmap.epoch; // make sure epoch is correct - pending_fsmap = map; - ss << "set mds map"; - } else { - ss << "next fsmap epoch " << pending_fsmap.epoch << " != " << e; - return -EINVAL; - } } else if (prefix == "mds set_state") { mds_gid_t gid; if (!cmd_getval(g_ceph_context, cmdmap, "gid", gid)) { diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index 59e7aed51f917..e92576086a8d2 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -329,10 +329,6 @@ COMMAND("mds set " \ "name=val,type=CephString " \ "name=confirm,type=CephString,req=false", \ "set mds parameter to ", "mds", "rw", "cli,rest") -COMMAND("mds setmap " \ - "name=epoch,type=CephInt,range=0 " \ - "name=confirm,type=CephString,req=false", - "set mds map; must supply correct epoch number", "mds", "rw", "cli,rest") // arbitrary limit 0-20 below; worth standing on head to make it // relate to actual state definitions? // #include "include/ceph_fs.h" diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index d9b8b6259ac01..a649731bfaf2e 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -380,17 +380,6 @@ class TestMDS(TestArgparse): def test_set_max_mds(self): self.check_1_natural_arg('mds', 'set_max_mds') - def test_setmap(self): - self.assert_valid_command(['mds', 'setmap', '1']) - self.assert_valid_command(['mds', 'setmap', '1', '--yes-i-really-mean-it']) - assert_equal({}, validate_command(sigdict, ['mds', 'setmap', - '--yes-i-really-mean-it'])) - assert_equal({}, validate_command(sigdict, ['mds', 'setmap', '-1', - '--yes-i-really-mean-it'])) - assert_equal({}, validate_command(sigdict, ['mds', 'setmap', '1', - '--yes-i-really-mean-it', - 'toomany'])) - def test_set_state(self): self.assert_valid_command(['mds', 'set_state', '1', '2']) assert_equal({}, validate_command(sigdict, ['mds', 'set_state'])) -- 2.39.5