RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #44075 into master

Browse Source 
* refs/pull/44075/head:
	mgr/cephadm: drop osdspec_affinity tracking

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
This commit is contained in:
Sage Weil 2021-11-26 15:15:27 -05:00
commit 45312c8627
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,8 +716,6 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
sd.rank = int(d['rank']) if d.get('rank') is not None else None
sd.rank_generation = int(d['rank_generation']) if d.get(
'rank_generation') is not None else None
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 = {
@ -1927,7 +1925,7 @@ Then run the following:
for h, dm in self.cache.get_daemons_with_volatile_status():
osds_to_remove = []
for name, dd in dm.items():
if dd.daemon_type == 'osd' and (dd.service_name() == service_name or not dd.osdspec_affinity):
if dd.daemon_type == 'osd' and dd.service_name() == service_name:
osds_to_remove.append(str(dd.daemon_id))
if osds_to_remove:
osds_msg[h] = osds_to_remove

3
src/pybind/mgr/cephadm/services/osd.py
View File

@ -353,9 +353,6 @@ class OSDService(CephService):
error_ok=True)
return out, err, code
def get_osdspec_affinity(self, osd_id: str) -> str:
return self.mgr.get('osd_metadata').get(osd_id, {}).get('osdspec_affinity', '')
def post_remove(self, daemon: DaemonDescription, is_failed_deploy: bool) -> None:
# Do not remove the osd.N keyring, if we failed to deploy the OSD, because
# we cannot recover from it. The OSD keys are created by ceph-volume and not by

1
src/pybind/mgr/cephadm/tests/fixtures.py
View File

@ -86,7 +86,6 @@ def with_cephadm_module(module_options=None, store=None):
with mock.patch("cephadm.module.CephadmOrchestrator.get_ceph_option", get_ceph_option),\
mock.patch("cephadm.services.osd.RemoveUtil._run_mon_cmd"), \
mock.patch("cephadm.module.CephadmOrchestrator.get_osdmap"), \
mock.patch("cephadm.services.osd.OSDService.get_osdspec_affinity", return_value='test_spec'), \
mock.patch("cephadm.module.CephadmOrchestrator.remote"), \
mock.patch("cephadm.agent.CephadmAgentHelpers._request_agent_acks"), \
mock.patch("cephadm.agent.CephadmAgentHelpers._apply_agent", return_value=False), \