From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Feb 2020 16:14:53 +0000 (-0600)
Subject: mgr/cephadm: catch exception in _check_hosts()
X-Git-Tag: v15.1.1~465^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8eebeede04ca13d780ec5eaa10ff1225889f6d5a;p=ceph.git

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 a1c2c8819e7f..06bd225533a5 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: