From: Sage Weil <sage@newdream.net>
Date: Thu, 6 May 2021 18:16:38 +0000 (-0400)
Subject: mgr/cephadm: fix logging of config/placement errors
X-Git-Tag: v16.2.5~87^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbc0dd9963de883958494c345f8e9c8d78e8f682;p=ceph.git

mgr/cephadm: fix logging of config/placement errors

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 14af47070a8b05b8e8e9f94a7676d573407f3a16)
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index da62716eacd9..652d9c0c0f1e 100644
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -782,10 +782,10 @@ class CephadmServe:
                 self._create_daemon(daemon_spec)
                 r = True
             except (RuntimeError, OrchestratorError) as e:
-                self.mgr.events.for_service(
-                    spec, 'ERROR',
-                    f"Failed while placing {slot.daemon_type}.{daemon_id} "
-                    f"on {slot.hostname}: {e}")
+                msg = (f"Failed while placing {slot.daemon_type}.{daemon_id} "
+                       f"on {slot.hostname}: {e}")
+                self.mgr.events.for_service(spec, 'ERROR', msg)
+                self.mgr.log.error(msg)
                 # only return "no change" if no one else has already succeeded.
                 # later successes will also change to True
                 if r is None: