From: Adam King <adking@redhat.com>
Date: Wed, 17 Feb 2021 21:51:30 +0000 (-0500)
Subject: mgr/cephadm: error if service action called with daemonless service
X-Git-Tag: v17.1.0~2863^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0618c69dc5255bd407595250c6980cf4929a8ce6;p=ceph.git

mgr/cephadm: error if service action called with daemonless service

Fixes: https://tracker.ceph.com/issues/49348

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index ae79d89e3784..54a36375db34 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1584,6 +1584,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
     @trivial_completion
     def service_action(self, action: str, service_name: str) -> List[str]:
         dds: List[DaemonDescription] = self.cache.get_daemons_by_service(service_name)
+        if not dds:
+            raise OrchestratorError(f'No daemons exist under service name "{service_name}".'
+                                    + ' View currently running services using "ceph orch ls"')
         self.log.info('%s service %s' % (action.capitalize(), service_name))
         return [
             self._schedule_daemon_action(dd.name(), action)