From 7142ab4a20f194f0c24e1159147f2bbadb9ab97a Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Fri, 22 Feb 2019 14:13:47 -0800 Subject: [PATCH] mgr/dashboard: fix for using '::' on hosts without ipv6 CherryPy throws an uncaught exception using '::' when the host does not have an ipv6 loopback address. This is currently the case in kubernetes. This patch disables the routine in cherrypy that performs the validation that requested server ports are actually bound. fixes: http://tracker.ceph.com/issues/38575 Signed-off-by: Noah Watkins (cherry picked from commit 384d82a1bb1a3f0c2b1027968f03fe7834daad6a) --- src/pybind/mgr/dashboard/module.py | 13 +++++++++++++ src/pybind/mgr/prometheus/module.py | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py index 0b53743d743..b0b8aec3a07 100644 --- a/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py @@ -49,6 +49,19 @@ if cherrypy is not None: HTTPConnection.__init__ = fixed_init +# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify +# that the ports its listening on are in fact bound. When using the any address +# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes) +# ipv6 isn't yet configured / supported and CherryPy throws an uncaught +# exception. +if cherrypy is not None: + v = StrictVersion(cherrypy.__version__) + # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on + # centos:7) and back to at least 3.0.0. + if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"): + # https://github.com/cherrypy/cherrypy/issues/1100 + from cherrypy.process import servers + servers.wait_for_occupied_port = lambda host, port: None if 'COVERAGE_ENABLED' in os.environ: import coverage diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index 4b68279533e..0abaa8b7f31 100644 --- a/src/pybind/mgr/prometheus/module.py +++ b/src/pybind/mgr/prometheus/module.py @@ -1,4 +1,5 @@ import cherrypy +from distutils.version import StrictVersion import json import errno import math @@ -15,6 +16,19 @@ from mgr_module import MgrModule, MgrStandbyModule, CommandResult DEFAULT_ADDR = '::' DEFAULT_PORT = 9283 +# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify +# that the ports its listening on are in fact bound. When using the any address +# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes) +# ipv6 isn't yet configured / supported and CherryPy throws an uncaught +# exception. +if cherrypy is not None: + v = StrictVersion(cherrypy.__version__) + # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on + # centos:7) and back to at least 3.0.0. + if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"): + # https://github.com/cherrypy/cherrypy/issues/1100 + from cherrypy.process import servers + servers.wait_for_occupied_port = lambda host, port: None # cherrypy likes to sys.exit on error. don't let it take us down too! def os_exit_noop(*args, **kwargs): -- 2.47.3