]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MgrMonitor: drop nautilus modules from always_on_modules 42408/head
authorKefu Chai <kchai@redhat.com>
Tue, 20 Jul 2021 03:01:56 +0000 (11:01 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 20 Jul 2021 03:09:09 +0000 (11:09 +0800)
the list of always_on_modules for the older versions is only for the
upgrade use case, where the monitor is still the old release, so
we have to keep an entry for the old release in the always_on_modules
map.

but since we don't upgrade from a release older than 2 releases, there
is no need to keep an entry for nautilus.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/mon/MgrMonitor.cc

index 1e2b946ec273378ba73a83e2e6d865e5b54e9b05..ef246e648c6c1e034a1a87747c2cfb1405ca77b9 100644 (file)
@@ -68,18 +68,6 @@ static ostream& _prefix(std::ostream *_dout, Monitor &mon,
 // the system treats always_on_modules as if they provide built-in functionality
 // by ensuring that they are always enabled.
 const static std::map<uint32_t, std::set<std::string>> always_on_modules = {
-  {
-    CEPH_RELEASE_NAUTILUS, {
-      "crash",
-      "status",
-      "progress",
-      "balancer",
-      "devicehealth",
-      "orchestrator_cli",
-      "rbd_support",
-      "volumes",
-    }
-  },
   {
     CEPH_RELEASE_OCTOPUS, {
       "crash",