From 8eebeede04ca13d780ec5eaa10ff1225889f6d5a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 8 Feb 2020 10:14:53 -0600 Subject: [PATCH] mgr/cephadm: catch exception in _check_hosts() Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index a1c2c8819e7..06bd225533a 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -678,14 +678,19 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): bad_hosts = [] for host, v in self.inventory.items(): self.log.debug(' checking %s' % host) - out, err, code = self._run_cephadm(host, 'client', 'check-host', [], - error_ok=True, no_fsid=True) - if code: + try: + out, err, code = self._run_cephadm( + host, 'client', 'check-host', [], + error_ok=True, no_fsid=True) + if code: + self.log.debug(' host %s failed check' % host) + if self.warn_on_failed_host_check: + bad_hosts.append('host %s failed check: %s' % (host, err)) + else: + self.log.debug(' host %s ok' % host) + except Exception as e: self.log.debug(' host %s failed check' % host) - if self.warn_on_failed_host_check: - bad_hosts.append('host %s failed check: %s' % (host, err)) - else: - self.log.debug(' host %s ok' % host) + bad_hosts.append('host %s failed check: %s' % (host, e)) if 'CEPHADM_HOST_CHECK_FAILED' in self.health_checks: del self.health_checks['CEPHADM_HOST_CHECK_FAILED'] if bad_hosts: -- 2.39.5