mgr/cephadm: catch exception in _check_hosts()

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index a1c2c8819e7f6523aabf8a4f37ddd7f9bf8efeb9..06bd225533a5d60d767d87e7497825fde41bbf5e 100644 (file)
--- 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: