From: Melissa Li Date: Sat, 6 Nov 2021 03:36:01 +0000 (-0400) Subject: mgr/cephadm: fix tcmu-runner cephadm_stray_daemon X-Git-Tag: v16.2.8~189^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ec018278012a775d461d0d0c8e28f1585049bb4;p=ceph.git mgr/cephadm: fix tcmu-runner cephadm_stray_daemon Adds tcmu-runner daemon to `managed` to prevent cephadm from raising a cephadm_stray_daemon health warning whenever an image is added to a target Fixes: https://tracker.ceph.com/issues/51111 Signed-off-by: Melissa Li (cherry picked from commit 12e0eaae7a510d38f317bee65cb962f246c4ab9d) --- diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 69814236e81..9cf69e5f435 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -527,7 +527,11 @@ class CephadmServe: s.get('type'), s.get('id') ) ) - + if s.get('type') == 'tcmu-runner': + # because we don't track tcmu-runner daemons in the host cache + # and don't have a way to check if the daemon is part of iscsi service + # we assume that all tcmu-runner daemons are managed by cephadm + managed.append(name) if host not in self.mgr.inventory: missing_names.append(name) host_num_daemons += 1