RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 10:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/cephadm: move _refresh_host_daemons to serve.py

Browse Source 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
This commit is contained in:
Sebastian Wagner 2020-09-11 12:59:12 +02:00
parent d691469400
commit 698ae220e1
3 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1363,59 +1363,6 @@ To check that the host is reachable:
self.log.debug(f'Refreshed OSDSpec previews for host <{host}>')
return True
def _refresh_host_daemons(self, host) -> Optional[str]:
try:
out, err, code = self._run_cephadm(
host, 'mon', 'ls', [], no_fsid=True)
if code:
return 'host %s cephadm ls returned %d: %s' % (
host, code, err)
except Exception as e:
return 'host %s scrape failed: %s' % (host, e)
ls = json.loads(''.join(out))
dm = {}
for d in ls:
if not d['style'].startswith('cephadm'):
continue
if d['fsid'] != self._cluster_fsid:
continue
if '.' not in d['name']:
continue
sd = orchestrator.DaemonDescription()
sd.last_refresh = datetime.datetime.utcnow()
for k in ['created', 'started', 'last_configured', 'last_deployed']:
v = d.get(k, None)
if v:
setattr(sd, k, str_to_datetime(d[k]))
sd.daemon_type = d['name'].split('.')[0]
sd.daemon_id = '.'.join(d['name'].split('.')[1:])
sd.hostname = host
sd.container_id = d.get('container_id')
if sd.container_id:
# shorten the hash
sd.container_id = sd.container_id[0:12]
sd.container_image_name = d.get('container_image_name')
sd.container_image_id = d.get('container_image_id')
sd.version = d.get('version')
if sd.daemon_type == 'osd':
sd.osdspec_affinity = self.osd_service.get_osdspec_affinity(sd.daemon_id)
if 'state' in d:
sd.status_desc = d['state']
sd.status = {
'running': 1,
'stopped': 0,
'error': -1,
'unknown': -1,
}[d['state']]
else:
sd.status_desc = 'unknown'
sd.status = None
dm[sd.name()] = sd
self.log.debug('Refreshed host %s daemons (%d)' % (host, len(dm)))
self.cache.update_host_daemons(host, dm)
self.cache.save_host(host)
return None
def _refresh_host_devices(self, host) -> Optional[str]:
try:
out, err, code = self._run_cephadm(

62
src/pybind/mgr/cephadm/serve.py
View File

@ -1,7 +1,10 @@
import datetime
import json
import logging
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Optional
from cephadm.utils import forall_hosts, cephadmNoImage
import orchestrator
from cephadm.utils import forall_hosts, cephadmNoImage, str_to_datetime
from orchestrator import OrchestratorError
if TYPE_CHECKING:
@ -85,7 +88,7 @@ class CephadmServe:
bad_hosts.append(r)
if self.mgr.cache.host_needs_daemon_refresh(host):
self.log.debug('refreshing %s daemons' % host)
r = self.mgr._refresh_host_daemons(host)
r = self._refresh_host_daemons(host)
if r:
failures.append(r)
@ -161,3 +164,56 @@ class CephadmServe:
except Exception as e:
self.log.debug(' host %s failed check' % host)
return 'host %s failed check: %s' % (host, e)
def _refresh_host_daemons(self, host) -> Optional[str]:
try:
out, err, code = self.mgr._run_cephadm(
host, 'mon', 'ls', [], no_fsid=True)
if code:
return 'host %s cephadm ls returned %d: %s' % (
host, code, err)
except Exception as e:
return 'host %s scrape failed: %s' % (host, e)
ls = json.loads(''.join(out))
dm = {}
for d in ls:
if not d['style'].startswith('cephadm'):
continue
if d['fsid'] != self.mgr._cluster_fsid:
continue
if '.' not in d['name']:
continue
sd = orchestrator.DaemonDescription()
sd.last_refresh = datetime.datetime.utcnow()
for k in ['created', 'started', 'last_configured', 'last_deployed']:
v = d.get(k, None)
if v:
setattr(sd, k, str_to_datetime(d[k]))
sd.daemon_type = d['name'].split('.')[0]
sd.daemon_id = '.'.join(d['name'].split('.')[1:])
sd.hostname = host
sd.container_id = d.get('container_id')
if sd.container_id:
# shorten the hash
sd.container_id = sd.container_id[0:12]
sd.container_image_name = d.get('container_image_name')
sd.container_image_id = d.get('container_image_id')
sd.version = d.get('version')
if sd.daemon_type == 'osd':
sd.osdspec_affinity = self.mgr.osd_service.get_osdspec_affinity(sd.daemon_id)
if 'state' in d:
sd.status_desc = d['state']
sd.status = {
'running': 1,
'stopped': 0,
'error': -1,
'unknown': -1,
}[d['state']]
else:
sd.status_desc = 'unknown'
sd.status = None
dm[sd.name()] = sd
self.log.debug('Refreshed host %s daemons (%d)' % (host, len(dm)))
self.mgr.cache.update_host_daemons(host, dm)
self.mgr.cache.save_host(host)
return None

6
src/pybind/mgr/cephadm/tests/test_cephadm.py
View File

@ -173,7 +173,7 @@ class TestCephadm(object):
def test_list_daemons(self, cephadm_module: CephadmOrchestrator):
cephadm_module.service_cache_timeout = 10
with with_host(cephadm_module, 'test'):
cephadm_module._refresh_host_daemons('test')
CephadmServe(cephadm_module)._refresh_host_daemons('test')
c = cephadm_module.list_daemons()
assert wait(cephadm_module, c)[0].name() == 'rgw.myrgw.foobar'
@ -492,7 +492,7 @@ class TestCephadm(object):
@mock.patch("cephadm.services.osd.RemoveUtil.get_pg_count", lambda _, __: 0)
def test_remove_osds(self, cephadm_module):
with with_host(cephadm_module, 'test'):
cephadm_module._refresh_host_daemons('test')
CephadmServe(cephadm_module)._refresh_host_daemons('test')
c = cephadm_module.list_daemons()
wait(cephadm_module, c)
@ -548,7 +548,7 @@ class TestCephadm(object):
))
def test_remove_daemon(self, cephadm_module):
with with_host(cephadm_module, 'test'):
cephadm_module._refresh_host_daemons('test')
CephadmServe(cephadm_module)._refresh_host_daemons('test')
c = cephadm_module.list_daemons()
wait(cephadm_module, c)
c = cephadm_module.remove_daemons(['rgw.myrgw.myhost.myid'])