From 77ad9eba7bf8ffb228f0885e06fa55f6330f8703 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 2 Dec 2019 15:06:14 -0600 Subject: [PATCH] mgr/ssh: fix service_action Broken by the new completions Signed-off-by: Sage Weil --- src/pybind/mgr/ssh/module.py | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py index 306b500d85c3d..9975f7fd111bf 100644 --- a/src/pybind/mgr/ssh/module.py +++ b/src/pybind/mgr/ssh/module.py @@ -765,23 +765,26 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator): action, service_type, service_name, service_id)) if action == 'reload': return trivial_result(["Reload is a no-op"]) - daemons = self._get_services( + + def _proc_daemons(daemons): + args = [] + for d in daemons: + args.append((d.service_type, d.service_instance, + d.nodename, action)) + if not args: + if service_name: + n = service_name + '-*' + else: + n = service_id + raise orchestrator.OrchestratorError( + 'Unable to find %s.%s daemon(s)' % ( + service_type, n)) + return self._service_action(args) + + return self._get_services( service_type, service_name=service_name, - service_id=service_id) - args = [] - for d in daemons: - args.append((d.service_type, d.service_instance, - d.nodename, action)) - if not args: - if service_name: - n = service_name + '-*' - else: - n = service_id - raise orchestrator.OrchestratorError( - 'Unable to find %s.%s daemon(s)' % ( - service_type, n)) - return self._service_action(args) + service_id=service_id).then(_proc_daemons) @async_map_completion def _service_action(self, service_type, service_id, host, action): @@ -814,7 +817,7 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator): error_ok=True) self.service_cache.invalidate(host) self.log.debug('_service_action code %s out %s' % (code, out)) - return "{} {} from host '{}'".format(action, name, host) + return trivial_result("{} {} from host '{}'".format(action, name, host)) def get_inventory(self, node_filter=None, refresh=False): """ -- 2.39.5