From ba826774087acaedf8bb1abbef44115429268417 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 18 Mar 2020 10:09:00 -0500 Subject: [PATCH] mgr/cephadm: do not reconfig unmanaged services Fixes: https://tracker.ceph.com/issues/44615 Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 53798257222..baefd0c12b1 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -2430,13 +2430,17 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): grafanas = [] # type: List[orchestrator.DaemonDescription] for dd in daemons: # orphan? - if dd.service_name() not in self.spec_store.specs and \ - dd.daemon_type not in ['mon', 'mgr', 'osd']: + spec = self.spec_store.specs.get(dd.service_name(), None) + if not spec and dd.daemon_type not in ['mon', 'mgr', 'osd']: # (mon and mgr specs should always exist; osds aren't matched # to a service spec) self.log.info('Removing orphan daemon %s...' % dd.name()) self._remove_daemon(dd.name(), dd.hostname) + # ignore unmanaged services + if not spec or spec.unmanaged: + continue + # dependencies? if dd.daemon_type == 'grafana': # put running instances at the front of the list -- 2.39.5