]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: rewrite/simplify describe_service 40736/head
authorSage Weil <sage@newdream.net>
Fri, 9 Apr 2021 20:26:00 +0000 (16:26 -0400)
committerSage Weil <sage@newdream.net>
Sat, 10 Apr 2021 13:12:23 +0000 (09:12 -0400)
commit58d9e90425679fd715aa31d7c8f1044f4582388e
tree43fd3d61a2d0f36d51dd8b54e20516601e113e93
parent5adef5f7663e25dc946a9a44d5a1ac33e8452ccf
mgr/cephadm: rewrite/simplify describe_service

The prior implementation first tried to fabricate services based on the
running daemons, and then filled in defined services on top.  This led
to duplication and a range of small errors.

Instead, flip this around: start with the services that are defined,
and only fill in 'unmanaged' services where we need to.

Drop the osd kludges and instead rely on DaemonDescription.service_id to
return the right thing.

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