]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: get rbd-mirror daemon-id when checking for strays
authorAdam King <adking@redhat.com>
Wed, 23 Sep 2020 16:52:37 +0000 (12:52 -0400)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 18 Nov 2020 10:51:52 +0000 (11:51 +0100)
commitcf62bc62293862243e9212b51608bec374b8c128
treec61583f27fa69fe3ebf0e6f75ca312efa5d71e48
parentb444287b687746ffea8f57b2a5ea9e0286f52f79
mgr/cephadm: get rbd-mirror daemon-id when checking for strays

Currently, list_servers() gets the rbd-mirror service-id instead
of the daemon-id so the daemon is marked as stray. This PR uses
that service-id to find the daemon-id and uses that to check if
the daemon is stray.

Fixes: https://tracker.ceph.com/issues/47639
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 83d878f3d94a31c03ce94788236bd584c878a89c)
src/pybind/mgr/cephadm/module.py