From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 25 Feb 2021 00:31:11 +0000 (-0800)
Subject: Revert "mon/MDSMonitor: add missing frozen checks"
X-Git-Tag: v17.1.0~2782^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=792ef2cea0c3e34edd492c98216aab005f25b599;p=ceph-ci.git

Revert "mon/MDSMonitor: add missing frozen checks"

The frozen check broke manual MDS failing in some tests.

This reverts commit 725a4b8b42f7cb03138cc1fa950b160abdd52125.

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

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 43ee0a3a473..38c16d63045 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1233,11 +1233,6 @@ bool MDSMonitor::fail_mds_gid(FSMap &fsmap, mds_gid_t gid)
   const auto& info = fsmap.get_info_gid(gid);
   dout(1) << "fail_mds_gid " << gid << " mds." << info.name << " role " << info.rank << dendl;
 
-  if (info.is_frozen()) {
-    dout(1) << "mds is frozen" << dendl;
-    return false;
-  }
-
   ceph_assert(mon.osdmon()->is_writeable());
 
   epoch_t blocklist_epoch = 0;
@@ -2000,10 +1995,7 @@ bool MDSMonitor::maybe_resize_cluster(FSMap &fsmap, fs_cluster_id_t fscid)
   } else if (in > max) {
     mds_rank_t target = in - 1;
     const auto &info = mds_map.get_info(target);
-    if (info.is_frozen()) {
-      dout(1) << "highest rank is frozen" << dendl;
-      return false;
-    } else if (mds_map.is_active(target)) {
+    if (mds_map.is_active(target)) {
       dout(1) << "stopping " << target << dendl;
       mon.clog->info() << "stopping " << info.human_name();
       auto f = [](auto& info) {