From: Tim Serong <tserong@suse.com>
Date: Thu, 14 Mar 2019 11:48:44 +0000 (+1100)
Subject: mgr/deepsea: log salt job failures
X-Git-Tag: v15.0.0~17^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78c3d65ca9092bdab51ae1e6b6beb3ee37e72938;p=ceph.git

mgr/deepsea: log salt job failures

If a request to salt succeeds, but the event comes back with some internal
failure (e.g.: an exception was thrown inside the salt runner), we need to
log this so the admin can find out what on earth went wrong.

Signed-off-by: Tim Serong <tserong@suse.com>
---

diff --git a/src/pybind/mgr/deepsea/module.py b/src/pybind/mgr/deepsea/module.py
index 8fdb4e4fb4d8..6286942c2f5b 100644
--- a/src/pybind/mgr/deepsea/module.py
+++ b/src/pybind/mgr/deepsea/module.py
@@ -144,6 +144,8 @@ class DeepSeaOrchestrator(MgrModule, orchestrator.Orchestrator):
                         dev.metadata_space_free = d['metadata_space_free']
                         devs.append(dev)
                     result.append(orchestrator.InventoryNode(node_name, devs))
+            else:
+                self.log.error(event_data['return'])
             return result
 
         with self._completion_lock:
@@ -189,6 +191,8 @@ class DeepSeaOrchestrator(MgrModule, orchestrator.Orchestrator):
                         desc.service_instance = service_instance
                         desc.service_type = service_type
                         result.append(desc)
+            else:
+                self.log.error(event_data['return'])
             return result
 
         with self._completion_lock: