import 15.2.5

[ceph.git] / ceph / src / mgr / PyModuleRegistry.cc

diff --git a/ceph/src/mgr/PyModuleRegistry.cc b/ceph/src/mgr/PyModuleRegistry.cc
index 2897684c4aedd20e6496477678dfe922617562e6..1768292aa5cf8784c018295d9e3cc4ef6f20c1b1 100644 (file)
--- a/ceph/src/mgr/PyModuleRegistry.cc
+++ b/ceph/src/mgr/PyModuleRegistry.cc
@@ -370,6 +370,9 @@ void PyModuleRegistry::get_health_checks(health_check_map_t *checks)
 
     // report failed always_on modules as health errors
     for (const auto& name : mgr_map.get_always_on_modules()) {
+      if (active_modules->is_pending(name)) {
+       continue;
+      }
       if (!active_modules->module_exists(name)) {
         if (failed_modules.find(name) == failed_modules.end() &&
             dependency_modules.find(name) == dependency_modules.end()) {