From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 30 Jul 2020 11:38:45 +0000 (+0200)
Subject: mgr/cephadm: Don't run `daemons_post` if _create_daemon fail
X-Git-Tag: v15.2.5~26^2~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ad2a9c20dee1dab0dfb350bf75f975c27b9b03a;p=ceph.git

mgr/cephadm: Don't run `daemons_post` if _create_daemon fail

We can't run daemon_check_post for the type, if a single daemon failed.
Mainly cause `daemon_check_post` is run by service type.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit fdaa00977e3d9ee3bd1c6f5be69a0e93d6825136)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 476c1d99234..287d4ccdad8 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2129,9 +2129,13 @@ you may want to run:
                         reconfig=True)
                 except OrchestratorError as e:
                     self.events.from_orch_error(e)
+                    if dd.daemon_type in daemons_post:
+                        del daemons_post[dd.daemon_type]
                     # continue...
                 except Exception as e:
                     self.events.for_daemon_from_exception(dd.name(), e)
+                    if dd.daemon_type in daemons_post:
+                        del daemons_post[dd.daemon_type]
                     # continue...
 
         # do daemon post actions