From: Sebastian Wagner <sewagner@redhat.com>
Date: Wed, 20 Oct 2021 09:48:09 +0000 (+0200)
Subject: Merge pull request #43366 from adk3798/log-list-servers
X-Git-Tag: v17.1.0~639
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2da4ec9b4e6dfef047cadbea00470a7803443a4;p=ceph.git

Merge pull request #43366 from adk3798/log-list-servers

mgr/cephadm: put list_servers output in debug logs

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
---

f2da4ec9b4e6dfef047cadbea00470a7803443a4
diff --cc src/pybind/mgr/cephadm/serve.py
index bd428be5761e,019d847f6598..6d45240974e9
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@@ -472,9 -533,11 +472,10 @@@ class CephadmServe
          self.log.debug('_check_for_strays')
          for k in ['CEPHADM_STRAY_HOST',
                    'CEPHADM_STRAY_DAEMON']:
 -            if k in self.mgr.health_checks:
 -                del self.mgr.health_checks[k]
 +            self.mgr.remove_health_warning(k)
          if self.mgr.warn_on_stray_hosts or self.mgr.warn_on_stray_daemons:
              ls = self.mgr.list_servers()
+             self.log.debug(ls)
              managed = self.mgr.cache.get_daemon_names()
              host_detail = []     # type: List[str]
              host_num_daemons = 0