From: Sage Weil <sage@newdream.net>
Date: Sat, 23 Jan 2021 19:16:20 +0000 (-0600)
Subject: mon/MgrMonitor: add always_on_modules for quincy
X-Git-Tag: v17.1.0~3123^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=348ed248f43a1b225b389ec0d1e3de7fcf831774;p=ceph.git

mon/MgrMonitor: add always_on_modules for quincy

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 4c6bb7e4b5db..e40b6fb953e9 100644
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -64,7 +64,7 @@ Mon
 ---
 
 - [ ] qa/standalone/mon/misc adjust `TEST_mon_features` (add X cases and adjust `--mon-debug-no-require-X`)
-- [ ] mon/MgrMonitor.cc adjust `always_on_modules`
+- [x] mon/MgrMonitor.cc adjust `always_on_modules`
 - [ ] common/options.cc define `mon_debug_no_require_X`
 - [ ] common/options.cc remove `mon_debug_no_require_X-2`
 - [ ] mon/OSDMonitor.cc `create_initial`: adjust new `require_osd_release`, and add associated `mon_debug_no_require_X`
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 7fb8bc329097..5bff27602992 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -107,7 +107,21 @@ const static std::map<uint32_t, std::set<std::string>> always_on_modules = {
       "pg_autoscaler",
       "telemetry",
     }
-  }
+  },
+  {
+    CEPH_RELEASE_QUINCY, {
+      "crash",
+      "status",
+      "progress",
+      "balancer",
+      "devicehealth",
+      "orchestrator",
+      "rbd_support",
+      "volumes",
+      "pg_autoscaler",
+      "telemetry",
+    }
+  },
 };
 
 // Prefix for mon store of active mgr's command descriptions