]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #43712 from adk3798/endpoint-port
authorSebastian Wagner <sewagner@redhat.com>
Wed, 10 Nov 2021 10:15:07 +0000 (11:15 +0100)
committerGitHub <noreply@github.com>
Wed, 10 Nov 2021 10:15:07 +0000 (11:15 +0100)
mgr/cephadm: fix port handling for cephadm endpoint

Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
1  2 
src/pybind/mgr/cephadm/agent.py
src/pybind/mgr/cephadm/module.py

index 00d177bd7ffcb70b9d8a01d98b12bc1618ba4c3b,6f4a22741b18ac2b13a38da604c8e055f37c6ef2..624c3b20154725301012e62942fd1cdb864f1f68
@@@ -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()
Simple merge