RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 14:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #33736 into master

Browse Source 
* refs/pull/33736/head:
	mgr/cephadm: upgrade crash collectors too
	mgr/cephadm: fix service rm when there are no daemons

Reviewed-by: Joshua Schmid <jschmid@suse.de>
This commit is contained in:
Sage Weil 2020-03-05 06:34:18 -06:00
commit b7fd2e8d1e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pybind/mgr/cephadm/module.py
View File

@ -768,7 +768,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
daemons = self.cache.get_daemons()
done = 0
for daemon_type in ['mgr', 'mon', 'osd', 'rgw', 'mds']:
for daemon_type in ['mgr', 'mon', 'osd', 'rgw', 'mds', 'crash']:
self.log.info('Upgrade: Checking %s daemons...' % daemon_type)
need_upgrade_self = False
for d in daemons:
@ -1797,9 +1797,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
args.append(
(d.name(), d.hostname, True)
)
self.spec_store.rm(d.service_name())
self.log.info('Remove service %s (daemons %s)' % (
service_name, [a[0] for a in args]))
self.spec_store.rm(d.service_name())
return self._remove_daemons(args)
def get_inventory(self, host_filter=None, refresh=False):