cephfs: remove vestiges of mds deactivate

Fixes: http://tracker.ceph.com/issues/24001
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 684457c669b4f1cf405f38bf9696139bceb10591..350c0483492efbdcce1319f9e4ad472b8db5a765 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -21,6 +21,9 @@
   The secrets can be set using the 'rbd mirror pool peer add' and
   'rbd mirror pool peer set' actions.
 
+* The `ceph mds deactivate` is fully obsolete and references to it in the docs
+  have been removed or clarified.
+
 >=13.1.0
 --------
 

diff --git a/doc/cephfs/mds-states.rst b/doc/cephfs/mds-states.rst
index 617d8b1e3d5ee5aaba8359b1b7b2ed7bc9aec8b1..ecd5686c60339ed2b39fd856d4342d7b2d7e01e3 100644 (file)
--- a/doc/cephfs/mds-states.rst
+++ b/doc/cephfs/mds-states.rst
@@ -77,8 +77,8 @@ and enters the MDS cluster.
 
     up:stopping
 
-When a rank is deactivated (stopped), the monitors command an active MDS to
-enter the ``up:stopping`` state. In this state, the MDS accepts no new client
+When a rank is stopped, the monitors command an active MDS to enter the
+``up:stopping`` state. In this state, the MDS accepts no new client
 connections, migrates all subtrees to other ranks in the file system, flush its
 metadata journal, and, if the last rank (0), evict all clients and shutdown
 (see also :ref:`cephfs-administration`).

diff --git a/doc/cephfs/multimds.rst b/doc/cephfs/multimds.rst
index a60ef39e5a7e2193a68d8b69afde7255ca6228ce..097a0313e9e4ead2389257cf8ef0430348c8c8d9 100644 (file)
--- a/doc/cephfs/multimds.rst
+++ b/doc/cephfs/multimds.rst
@@ -80,20 +80,20 @@ Reducing the number of ranks is as simple as reducing ``max_mds``:
     ...
     # fsmap e10: 1/1/1 up {0=a=up:active}, 2 up:standby
 
-The cluster will automatically deactivate extra ranks incrementally until
-``max_mds`` is reached.
+The cluster will automatically stop extra ranks incrementally until ``max_mds``
+is reached.
 
 See :doc:`/cephfs/administration` for more details which forms ``<role>`` can
 take.
 
-Note: deactivated ranks will first enter the stopping state for a period of
+Note: stopped ranks will first enter the stopping state for a period of
 time while it hands off its share of the metadata to the remaining active
 daemons.  This phase can take from seconds to minutes.  If the MDS appears to
 be stuck in the stopping state then that should be investigated as a possible
 bug.
 
 If an MDS daemon crashes or is killed while in the ``up:stopping`` state, a
-standby will take over and the cluster monitors will against try to deactivate
+standby will take over and the cluster monitors will against try to stop
 the daemon.
 
 When a daemon finishes stopping, it will respawn itself and go back to being a

diff --git a/doc/cephfs/upgrading.rst b/doc/cephfs/upgrading.rst
index bfc29090814dc72d74bb0276e6ace9867f33e70a..253a7c697d286718bec9493c2f8c7d3f278c836d 100644 (file)
--- a/doc/cephfs/upgrading.rst
+++ b/doc/cephfs/upgrading.rst
@@ -18,7 +18,7 @@ The proper sequence for upgrading the MDS cluster is:
 
     ceph fs set <fs_name> max_mds 1
 
-2. Wait for cluster to deactivate non-zero ranks where only rank 0 is active and the rest are standbys.
+2. Wait for cluster to stop non-zero ranks where only rank 0 is active and the rest are standbys.
 
 ::
 

diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
index a486303ea79380afb6d9efa7c420aa4a6bdc990c..bfce4589b7d2043ad370d72c96feae7f2a70f8d8 100644 (file)
--- a/doc/man/8/ceph.rst
+++ b/doc/man/8/ceph.rst
@@ -33,7 +33,7 @@ Synopsis
 
 | **ceph** **log** *<logtext>* [ *<logtext>*... ]
 
-| **ceph** **mds** [ *compat* \| *deactivate* \| *fail* \| *rm* \| *rmfailed* \| *set_state* \| *stat* \| *repaired* ] ...
+| **ceph** **mds** [ *compat* \| *fail* \| *rm* \| *rmfailed* \| *set_state* \| *stat* \| *repaired* ] ...
 
 | **ceph** **mon** [ *add* \| *dump* \| *getmap* \| *remove* \| *stat* ] ...
 
@@ -371,12 +371,6 @@ Usage::
 
        ceph mds compat show
 
-Subcommand ``deactivate`` stops mds.
-
-Usage::
-
-       ceph mds deactivate <role>
-
 Subcommand ``fail`` forces mds to status fail.
 
 Usage::

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index cdbe55b3e9d2060aaa90d6c843e7cc4c75507183..c8b319e253f12f868c612e2757a7e97222a69d0d 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -917,7 +917,6 @@ function test_mon_mds()
   fail_all_mds $FS_NAME
 
   ceph mds compat show
-  expect_false ceph mds deactivate 2
   ceph fs dump
   ceph fs get $FS_NAME
   for mds_gid in $(get_mds_gids $FS_NAME) ; do

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index f127833d6a4bb1e2205924946d847af8945bdc87..dd691f35efd680c51b3db147c6c9b1703ef30719 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -707,7 +707,7 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op)
       const auto &fs = pending.get_filesystem(fscid);
 
       mon->clog->info() << info.human_name() << " finished "
-                        << "deactivating rank " << info.rank << " in filesystem "
+                        << "stopping rank " << info.rank << " in filesystem "
                         << fs->mds_map.fs_name << " (now has "
                         << fs->mds_map.get_num_in_mds() - 1 << " ranks)";
 
@@ -1299,11 +1299,7 @@ int MDSMonitor::filesystem_command(
   string whostr;
   cmd_getval(g_ceph_context, cmdmap, "role", whostr);
 
-  if (prefix == "mds deactivate") {
-    ss << "This command is deprecated because it is obsolete;"
-       << " to deactivate one or more MDS, decrease max_mds appropriately"
-       << " (ceph fs set <fsname> max_mds)";
-  } else if (prefix == "mds set_state") {
+  if (prefix == "mds set_state") {
     mds_gid_t gid;
     if (!cmd_getval(g_ceph_context, cmdmap, "gid", gid)) {
       ss << "error parsing 'gid' value '"
@@ -1787,15 +1783,15 @@ bool MDSMonitor::maybe_resize_cluster(FSMap &fsmap, fs_cluster_id_t fscid)
     mds_rank_t target = in - 1;
     const auto &info = mds_map.get_info(target);
     if (mds_map.is_active(target)) {
-      dout(1) << "deactivating " << target << dendl;
-      mon->clog->info() << "deactivating " << info.human_name();
+      dout(1) << "stopping " << target << dendl;
+      mon->clog->info() << "stopping " << info.human_name();
       fsmap.modify_daemon(info.global_id,
                             [] (MDSMap::mds_info_t *info) {
                                 info->state = MDSMap::STATE_STOPPING;
                             });
       return true;
     } else {
-      dout(20) << "skipping deactivate on " << target << dendl;
+      dout(20) << "skipping stop of " << target << dendl;
       return false;
     }
   }

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index 0d7232928c7bb0e1b17d98ce67c352bc90d69b9b..dc1cad873bc28aecc9b31e55f49cabde22ae3385 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -376,12 +376,6 @@ class TestMDS(TestArgparse):
         assert_equal({}, validate_command(sigdict, ['mds', 'compat',
                                                     'show', 'toomany']))
 
-    def test_deactivate(self):
-        self.assert_valid_command(['mds', 'deactivate', 'someone'])
-        assert_equal({}, validate_command(sigdict, ['mds', 'deactivate']))
-        assert_equal({}, validate_command(sigdict, ['mds', 'deactivate',
-                                                    'someone', 'toomany']))
-
     def test_set_state(self):
         self.assert_valid_command(['mds', 'set_state', '1', '2'])
         assert_equal({}, validate_command(sigdict, ['mds', 'set_state']))