From 0054a73b85b63c44d99d88cb28cc2839da54c1f6 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 20 Jul 2021 11:01:56 +0800 Subject: [PATCH] mon/MgrMonitor: drop nautilus modules from always_on_modules 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 --- src/mon/MgrMonitor.cc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index 1e2b946ec27..ef246e648c6 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -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> always_on_modules = { - { - CEPH_RELEASE_NAUTILUS, { - "crash", - "status", - "progress", - "balancer", - "devicehealth", - "orchestrator_cli", - "rbd_support", - "volumes", - } - }, { CEPH_RELEASE_OCTOPUS, { "crash", -- 2.47.3