]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: refactor `_set_maintenance_health_check` to use `set_health_warning...
authorMelissa Li <li.melissa.kun@gmail.com>
Tue, 3 Aug 2021 17:34:06 +0000 (13:34 -0400)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 2 Nov 2021 09:01:20 +0000 (10:01 +0100)
Fixes: https://tracker.ceph.com/issues/44414
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>
(cherry picked from commit c3f8fba04a629f2f3e70d0f5443a42de54426bf2)

src/pybind/mgr/cephadm/module.py

index 2a215ac548a103f589e760e87b46572abf25cd8f..0d98d89e082bec34fed1f111336b5c0ef0cd67e1 100644 (file)
@@ -1647,16 +1647,10 @@ Then run the following:
 
         in_maintenance = self.inventory.get_host_with_state("maintenance")
         if not in_maintenance:
-            if 'HOST_IN_MAINTENANCE' in self.health_checks:
-                del self.health_checks["HOST_IN_MAINTENANCE"]
+            self.remove_health_warning('HOST_IN_MAINTENANCE')
         else:
             s = "host is" if len(in_maintenance) == 1 else "hosts are"
-            self.health_checks["HOST_IN_MAINTENANCE"] = {
-                "severity": "warning",
-                "summary": f"{len(in_maintenance)} {s} in maintenance mode",
-                "detail": [f"{h} is in maintenance" for h in in_maintenance],
-            }
-        self.set_health_checks(self.health_checks)
+            self.set_health_warning("HOST_IN_MAINTENANCE", f"{len(in_maintenance)} {s} in maintenance mode", 1, [f"{h} is in maintenance" for h in in_maintenance])
 
     @handle_orch_error
     @host_exists()