From f53ea695fd63525b093984e687d5a7f49bdb21fa Mon Sep 17 00:00:00 2001 From: Melissa Li Date: Tue, 3 Aug 2021 13:40:39 -0400 Subject: [PATCH] mgr/cephadm: refactor `_update_paused_health` to use `set_health_warning` and `remove_health_warning` helpers Fixes: https://tracker.ceph.com/issues/44414 Signed-off-by: Melissa Li (cherry picked from commit cfd6ad0af2feac3a7611067dd7e88fed1b315023) --- src/pybind/mgr/cephadm/serve.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index e0f092131883a..19ed4a7f22af7 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -127,17 +127,9 @@ class CephadmServe: def _update_paused_health(self) -> None: if self.mgr.paused: - self.mgr.health_checks['CEPHADM_PAUSED'] = { - 'severity': 'warning', - 'summary': 'cephadm background work is paused', - 'count': 1, - 'detail': ["'ceph orch resume' to resume"], - } - self.mgr.set_health_checks(self.mgr.health_checks) + self.mgr.set_health_warning('CEPHADM_PAUSED', 'cephadm background work is paused', 1, ["'ceph orch resume' to resume"]) else: - if 'CEPHADM_PAUSED' in self.mgr.health_checks: - del self.mgr.health_checks['CEPHADM_PAUSED'] - self.mgr.set_health_checks(self.mgr.health_checks) + self.mgr.remove_health_warning('CEPHADM_PAUSED') def _autotune_host_memory(self, host: str) -> None: total_mem = self.mgr.cache.get_facts(host).get('memory_total_kb', 0) -- 2.39.5