From 444663b740da4e91cdf318f2661fc5cc0b76557c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 26 Apr 2021 15:28:48 -0400 Subject: [PATCH] mgr/cephadm: do not reconfigure daemons on deleted services Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/serve.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index f4499cba07d2..da62716eacd9 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -840,6 +840,10 @@ class CephadmServe: if spec and spec.unmanaged: continue + # ignore daemons for deleted services + if dd.service_name() in self.mgr.spec_store.spec_deleted: + continue + # These daemon types require additional configs after creation if dd.daemon_type in ['grafana', 'iscsi', 'prometheus', 'alertmanager', 'nfs']: daemons_post[dd.daemon_type].append(dd) -- 2.47.3