RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-20 09:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/orchestrator_cli: rename 'mds rm' arg

Browse Source 
'name' can be either a group prefix or an instance name, so use a general
variable name.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-10-28 11:55:30 -05:00
parent 984b754b40
commit 4e6316655f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pybind/mgr/orchestrator_cli/module.py
View File

@ -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())

6
src/pybind/mgr/ssh/module.py
View File

@ -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):