Merge pull request ceph#60602 from rhcs-dashboard/cherrypy-version-get-fix

mgr/dashboard: remove cherrypy_backports.py

Reviewed-by: Ernesto Puerta <[email protected]>
Reviewed-by: Afreen Misbah <[email protected]>
Reviewed-by: Adam King <[email protected]>
Reviewed-by: Casey Bodley <[email protected]>

Author: nizamial09

src/pybind/mgr/dashboard/cherrypy_backports.py

@@ -49,10 +49,6 @@
 
 from .services.sso import load_sso_db
 
-if cherrypy is not None:
-    from .cherrypy_backports import patch_cherrypy
-    patch_cherrypy(cherrypy.__version__)
-
 # pylint: disable=wrong-import-position
 from .plugins import PLUGIN_MANAGER, debug, feature_toggles, motd  # isort:skip # noqa E501 # pylint: disable=unused-import
 

src/pybind/mgr/dashboard/module.py

@@ -8,7 +8,6 @@
 import threading
 import time
 import enum
-from packaging import version  # type: ignore
 from collections import namedtuple
 import tempfile
 
@@ -29,21 +28,6 @@
 
 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:
-    Version = version.Version
-    v = Version(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 Version("3.1.2") <= v < Version("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(status: int) -> None: