RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/cephadm: move _refresh_host_osdspec_previews to serve.py

Browse Source 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
This commit is contained in:
Sebastian Wagner 2020-09-11 13:07:36 +02:00
parent f674fa22a7
commit d9811c3d85
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1345,24 +1345,6 @@ To check that the host is reachable:
self.log.info(msg)
return msg
def update_osdspec_previews(self, search_host: str = ''):
# Set global 'pending' flag for host
self.cache.loading_osdspec_preview.add(search_host)
previews = []
# query OSDSpecs for host <search host> and generate/get the preview
# There can be multiple previews for one host due to multiple OSDSpecs.
previews.extend(self.osd_service.get_previews(search_host))
self.log.debug(f"Loading OSDSpec previews to HostCache")
self.cache.osdspec_previews[search_host] = previews
# Unset global 'pending' flag for host
self.cache.loading_osdspec_preview.remove(search_host)
def _refresh_host_osdspec_previews(self, host) -> bool:
self.update_osdspec_previews(host)
self.cache.save_host(host)
self.log.debug(f'Refreshed OSDSpec previews for host <{host}>')
return True
def _deploy_etc_ceph_ceph_conf(self, host: str) -> Optional[str]:
config = self.get_minimal_ceph_conf()

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

@ -109,7 +109,7 @@ class CephadmServe:
if self.mgr.cache.host_needs_osdspec_preview_refresh(host):
self.log.debug(f"refreshing OSDSpec previews for {host}")
r = self.mgr._refresh_host_osdspec_previews(host)
r = self._refresh_host_osdspec_previews(host)
if r:
failures.append(r)
@ -248,6 +248,24 @@ class CephadmServe:
host, len(devices), len(networks)))
devices = inventory.Devices.from_json(devices)
self.mgr.cache.update_host_devices_networks(host, devices.devices, networks)
self.mgr.update_osdspec_previews(host)
self.update_osdspec_previews(host)
self.mgr.cache.save_host(host)
return None
def _refresh_host_osdspec_previews(self, host) -> bool:
self.update_osdspec_previews(host)
self.mgr.cache.save_host(host)
self.log.debug(f'Refreshed OSDSpec previews for host <{host}>')
return True
def update_osdspec_previews(self, search_host: str = ''):
# Set global 'pending' flag for host
self.mgr.cache.loading_osdspec_preview.add(search_host)
previews = []
# query OSDSpecs for host <search host> and generate/get the preview
# There can be multiple previews for one host due to multiple OSDSpecs.
previews.extend(self.mgr.osd_service.get_previews(search_host))
self.log.debug(f"Loading OSDSpec previews to HostCache")
self.mgr.cache.osdspec_previews[search_host] = previews
# Unset global 'pending' flag for host
self.mgr.cache.loading_osdspec_preview.remove(search_host)