]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr/cephadm: drop osdspec_affinity tracking
authorSage Weil <sage@newdream.net>
Tue, 23 Nov 2021 18:38:50 +0000 (13:38 -0500)
committerSage Weil <sage@newdream.net>
Tue, 23 Nov 2021 18:39:43 +0000 (13:39 -0500)
commit9c2b8f557ef374212b5d11464b04f443cb8d84e6
tree4983c8ce8d35c17f4a4a98cc5fc55dc359eb9c53
parent0f9ed11e6727bf4fccef4a0481cd9391f27d3cff
mgr/cephadm: drop osdspec_affinity tracking

We identify which drivespec legacy OSDs belong(ed) to by metadata they
report to the mgr.  Modern cephadm does this instead by looking at the
'service' property in the unit.meta file.  Having cephadm query the osd
metadata is expensive for large clusters, so let's avoid this and rely
entirely on unit.meta.

Worst case, some upgraded clusters will show OSDs as service 'osd' instead
of service 'osd.whatever' for whatever drivespec created them.

Signed-off-by: Sage Weil <sage@newdream.net>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/services/osd.py
src/pybind/mgr/cephadm/tests/fixtures.py