From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 16 Jul 2019 17:54:16 +0000 (-0400)
Subject: mon/mgr: add 'rbd_support' to list of always-on mgr modules
X-Git-Tag: v14.2.3~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e84c4474d2edbb4ea906d2b1ed951e1251e96199;p=ceph.git

mon/mgr: add 'rbd_support' to list of always-on mgr modules

The 'rbd_support' mgr module provides many background functions that
are required by the 'rbd' CLI performance queries, as well as future
background long-running maintenance tasks.

Fixes: http://tracker.ceph.com/issues/40790
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 7231aab4b844729c1c35da37515dce58026c26a2)

Conflicts:
	src/mon/MgrMonitor.cc: trivial resolution
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 08797200adb6..80e4121c4327 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -48,6 +48,7 @@ const static std::map<uint32_t, std::set<std::string>> always_on_modules = {
       "balancer",
       "devicehealth",
       "orchestrator_cli",
+      "rbd_support",
       "volumes",
     }
   }