Merge "Remove workaround for eventlet < 0.27.0"

oslo_service/eventlet_backdoor.py

@@ -256,12 +256,6 @@ def initialize_if_enabled(conf):
 def _main():
     import eventlet
     eventlet.monkey_patch(all=True)
-    # Monkey patch the original current_thread to use the up-to-date _active
-    # global variable. See https://bugs.launchpad.net/bugs/1863021 and
-    # https://github.com/eventlet/eventlet/issues/592
-    import __original_module_threading as orig_threading
-    import threading  # noqa
-    orig_threading.current_thread.__globals__['_active'] = threading._active
 
     from oslo_config import cfg
 

oslo_service/tests/__init__.py

@@ -25,10 +25,3 @@ if os.name == 'nt':
     eventlet.monkey_patch(os=False, thread=False)
 else:
     eventlet.monkey_patch()
-
-# Monkey patch the original current_thread to use the up-to-date _active
-# global variable. See https://bugs.launchpad.net/bugs/1863021 and
-# https://github.com/eventlet/eventlet/issues/592
-import __original_module_threading as orig_threading  # noqa
-import threading  # noqa
-orig_threading.current_thread.__globals__['_active'] = threading._active

oslo_service/tests/eventlet_service.py

@@ -125,12 +125,6 @@ class Server(service.ServiceBase):
 
 def run(port_queue, workers=3, process_time=0):
     eventlet.patcher.monkey_patch()
-    # Monkey patch the original current_thread to use the up-to-date _active
-    # global variable. See https://bugs.launchpad.net/bugs/1863021 and
-    # https://github.com/eventlet/eventlet/issues/592
-    import __original_module_threading as orig_threading  # noqa
-    import threading  # noqa
-    orig_threading.current_thread.__globals__['_active'] = threading._active
 
     def hi_app(environ, start_response):
         # Some requests need to take time to process so the connection

requirements.txt

@@ -1,6 +1,6 @@
 WebOb>=1.7.1 # MIT
 debtcollector>=1.2.0 # Apache 2.0
-eventlet>=0.25.2 # MIT
+eventlet>=0.27.0 # MIT
 greenlet>=0.4.15 # MIT
 oslo.utils>=3.40.2 # Apache-2.0
 oslo.concurrency>=3.25.0 # Apache-2.0