]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fix logging of config/placement errors
authorSage Weil <sage@newdream.net>
Thu, 6 May 2021 18:16:38 +0000 (14:16 -0400)
committerSage Weil <sage@newdream.net>
Thu, 3 Jun 2021 12:39:36 +0000 (07:39 -0500)
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 14af47070a8b05b8e8e9f94a7676d573407f3a16)

src/pybind/mgr/cephadm/serve.py

index da62716eacd970d9f83d74088aff03c043d4e7fd..652d9c0c0f1e2c998814fd789fa4a9b71fd13c83 100644 (file)
@@ -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: