mgr/cephadm: catch and log exceptions from apply

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 c39c9abc34c4562e3a9b61941fd2a3fc69adcb86..a415568bdd356e1987e1f3b002734d3316eab507 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2813,7 +2813,11 @@ receivers:
         specs = self.spec_store.find(service_name)
         completions = list()
         for spec in specs:
-            completions.append(func(spec))
+            try:
+                completions.append(func(spec))
+            except Exception as e:
+                self.log.warning('Failed to apply %s spec %s: %s' % (
+                    service_name, spec, e))
         if completions:
             return completions
         return [trivial_result("Nothing to do..")]