From: Sebastian Wagner Date: Wed, 10 Nov 2021 10:15:07 +0000 (+0100) Subject: Merge pull request #43712 from adk3798/endpoint-port X-Git-Tag: v17.1.0~473 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e8bc7150882183aa568c512a66b8fc7294f50e3;p=ceph.git Merge pull request #43712 from adk3798/endpoint-port mgr/cephadm: fix port handling for cephadm endpoint Reviewed-by: Daniel Pivonka Reviewed-by: Sebastian Wagner --- 6e8bc7150882183aa568c512a66b8fc7294f50e3 diff --cc src/pybind/mgr/cephadm/agent.py index 00d177bd7ffcb,6f4a22741b18a..624c3b2015472 --- a/src/pybind/mgr/cephadm/agent.py +++ b/src/pybind/mgr/cephadm/agent.py @@@ -84,13 -78,8 +81,13 @@@ class CherryPyThread(threading.Thread) 'tools.response_headers.on': True}} cherrypy.tree.mount(Root(self.mgr), '/', root_conf) self.mgr.log.info('Starting cherrypy engine...') - cherrypy.engine.start() + self.start_engine() self.mgr.log.info('Cherrypy engine started.') + agents_down = [] + for h in self.mgr.cache.get_hosts(): + if self.mgr.agent_helpers._check_agent(h): + agents_down.append(h) + self.mgr.agent_helpers._update_agent_down_healthcheck(agents_down) # wait for the shutdown event self.cherrypy_shutdown_event.wait() self.cherrypy_shutdown_event.clear()