From 4e6316655fd55b71e2b70792a88cf4bfcbe50b82 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 28 Oct 2019 11:55:30 -0500 Subject: [PATCH] mgr/orchestrator_cli: rename 'mds rm' arg 'name' can be either a group prefix or an instance name, so use a general variable name. Signed-off-by: Sage Weil --- src/pybind/mgr/orchestrator_cli/module.py | 8 ++++---- src/pybind/mgr/ssh/module.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py index 8c94a1a2ab7..9dec5d7c4c6 100644 --- a/src/pybind/mgr/orchestrator_cli/module.py +++ b/src/pybind/mgr/orchestrator_cli/module.py @@ -292,10 +292,10 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @_write_cli('orchestrator mds rm', - "name=svc_id,type=CephString", - 'Remove an MDS service') - def _mds_rm(self, svc_id): - completion = self.remove_mds(svc_id) + "name=name,type=CephString", + 'Remove an MDS service (mds id or fs_name)') + def _mds_rm(self, name): + completion = self.remove_mds(name) self._orchestrator_wait([completion]) orchestrator.raise_if_exception(completion) return HandleCommandResult(stdout=completion.result_str()) diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py index 5ee2c654333..c4f0bdfd17d 100644 --- a/src/pybind/mgr/ssh/module.py +++ b/src/pybind/mgr/ssh/module.py @@ -784,15 +784,15 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator): }) return self._create_daemon('mds', mds_id, host, keyring) - def remove_mds(self, mds_id): + def remove_mds(self, name): daemons = self._get_services('mds') results = [] for d in daemons: - if d.service_instance == mds_id or d.service_instance.startswith(mds_id + '-'): + if d.service_instance == name or d.service_instance.startswith(name + '-'): results.append(self._worker_pool.apply_async( self._remove_mds, (d.service_instance, d.nodename))) if not results: - raise RuntimeError('Unable to find mds.%s[-*] daemon(s)' % mds_id) + raise RuntimeError('Unable to find mds.%s[-*] daemon(s)' % name) return SSHWriteCompletion(results) def _remove_mds(self, mds_id, host): -- 2.39.5