From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 21 Jul 2020 08:21:23 +0000 (+0200)
Subject: Merge pull request #36147 from mgfritch/cephadm-service-fixup-mypy
X-Git-Tag: v16.1.0~1667
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e9ef360613b1520e35e81de08c122a30d6a7d92;p=ceph.git

Merge pull request #36147 from mgfritch/cephadm-service-fixup-mypy

mgr/cephadm: clean-up service module type checking

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

2e9ef360613b1520e35e81de08c122a30d6a7d92
diff --cc src/pybind/mgr/cephadm/module.py
index 73459d3f2336,8fec091c63d7..55e0dbf2a154
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -1813,27 -1781,20 +1813,27 @@@ you may want to run
          """
          (daemon_type, daemon_id) = name.split('.', 1)
  
 -        self.cephadm_services[daemon_type].pre_remove(daemon_id)
 +        with set_exception_subject('service', orchestrator.DaemonDescription(
 +                daemon_type=daemon_type,
 +                daemon_id=daemon_id,
 +                hostname=host,
 +        ).service_id(), overwrite=True):
 +
  
 -        args = ['--name', name, '--force']
 -        self.log.info('Removing daemon %s from %s' % (name, host))
 -        out, err, code = self._run_cephadm(
 -            host, name, 'rm-daemon', args)
 -        if not code:
 -            # remove item from cache
 -            self.cache.rm_daemon(host, name)
 -        self.cache.invalidate_host_daemons(host)
 -        return "Removed {} from host '{}'".format(name, host)
 +            self.cephadm_services[daemon_type].pre_remove(daemon_id)
 +
 +            args = ['--name', name, '--force']
 +            self.log.info('Removing daemon %s from %s' % (name, host))
 +            out, err, code = self._run_cephadm(
 +                host, name, 'rm-daemon', args)
 +            if not code:
 +                # remove item from cache
 +                self.cache.rm_daemon(host, name)
 +            self.cache.invalidate_host_daemons(host)
 +            return "Removed {} from host '{}'".format(name, host)
  
      def _config_fn(self, service_type) -> Optional[Callable[[ServiceSpec], None]]:
-         return {
+         fn = {
              'mds': self.mds_service.config,
              'rgw': self.rgw_service.config,
              'nfs': self.nfs_service.config,