From: Alex Ainscow Date: Fri, 10 Jan 2025 15:47:04 +0000 (-0500) Subject: mon/MgrMonitor: update for umbrella X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=043df2254dc931ff79deb7cf327ae95114e8f42a;p=ceph.git mon/MgrMonitor: update for umbrella Signed-off-by: Alex Ainscow --- diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst index 38236edaecf9..ec55e9fae106 100644 --- a/doc/dev/release-checklists.rst +++ b/doc/dev/release-checklists.rst @@ -80,7 +80,7 @@ Mon - [ ] src/test/cli/monmaptool/8.t: update output for monmaptool to X - [x] qa/standalone/mon/misc adjust `TEST_mon_features` (add X cases and adjust `--mon-debug-no-require-X`) - [x] qa/standalone/mon/misc bump up `jqfilter='.monmap.features.persistent | length == N'` to `N+1` -- [ ] mon/MgrMonitor.cc adjust `always_on_modules` +- [x] mon/MgrMonitor.cc adjust `always_on_modules` - [ ] common/options/global.yaml.in define `mon_debug_no_require_X` - [ ] common/options/global.yaml.in 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 a70e4ab76bec..5e85233a3d06 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -98,6 +98,7 @@ static const std::map>& always_on_modules() { { CEPH_RELEASE_REEF, octopus_modules }, { CEPH_RELEASE_SQUID, octopus_modules }, { CEPH_RELEASE_TENTACLE, octopus_modules }, + { CEPH_RELEASE_UMBRELLA, octopus_modules }, }; return always_on_modules_map; };