From: Sage Weil <sage@redhat.com>
Date: Mon, 9 Mar 2020 18:15:49 +0000 (-0500)
Subject: mgr/cephadm: do not remove daemons from remove_service
X-Git-Tag: v15.1.1~37^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3dfd1a5b15eb4fb16f966955e9fd927a4baf6798;p=ceph.git

mgr/cephadm: do not remove daemons from remove_service

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 8272bee58c317..bd805bc0203de 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1823,18 +1823,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         return self._remove_daemons(args)
 
     def remove_service(self, service_name):
-        args = []
-        for host, dm in self.cache.daemons.items():
-            for name, d in dm.items():
-                if d.matches_service(service_name):
-                    args.append(
-                        (d.name(), d.hostname, True)
-                    )
-        self.log.info('Remove service %s (daemons %s)' % (
-            service_name, [a[0] for a in args]))
+        self.log.info('Remove service %s' % service_name)
         self.spec_store.rm(service_name)
-        if args:
-            return self._remove_daemons(args)
+        self._kick_serve_loop()
         return trivial_result(['Removed service %s' % service_name])
 
     def get_inventory(self, host_filter=None, refresh=False):
diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index 6080ee5503b31..17300ce70a7c3 100644
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -226,7 +226,7 @@ class TestCephadm(object):
             wait(cephadm_module, c)
             c = cephadm_module.remove_service('rgw.myrgw')
             out = wait(cephadm_module, c)
-            assert out == ["Removed rgw.myrgw.foobar from host 'test'"]
+            assert out == ["Removed service rgw.myrgw"]
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     def test_rbd_mirror(self, cephadm_module):