openstack/oslo.service
Code Issues Proposed changes

Remove workaround for eventlet < 0.27.0

Browse Source 
This code worked around a bug in eventlet[1] that has been fixed in
115103d5608cbe8f15df10e27eba1644f5364e95. The fix has been available in
every eventlet release since v0.27.0.

[1] https://github.com/eventlet/eventlet/issues/592

Co-Authored-By: Cyril Roelandt <cyril@redhat.com>
Change-Id: Ia16fe6e4ea84eeffc56070b15b170c18f01cea45
This commit is contained in:
Takashi Kajinami
2024-09-27 23:46:22 +09:00
parent a84a9de729
commit 8fe67b4111
4 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
oslo_service/eventlet_backdoor.py
View File

@@ -256,12 +256,6 @@ def initialize_if_enabled(conf):
def _main(): def _main():
import eventlet import eventlet
eventlet.monkey_patch(all=True) 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 from oslo_config import cfg

7
oslo_service/tests/__init__.py
View File

@@ -25,10 +25,3 @@ if os.name == 'nt':
eventlet.monkey_patch(os=False, thread=False) eventlet.monkey_patch(os=False, thread=False)
else: else:
eventlet.monkey_patch() 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

6
oslo_service/tests/eventlet_service.py
View File

@@ -125,12 +125,6 @@ class Server(service.ServiceBase):
def run(port_queue, workers=3, process_time=0): def run(port_queue, workers=3, process_time=0):
eventlet.patcher.monkey_patch() 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): def hi_app(environ, start_response):
# Some requests need to take time to process so the connection # Some requests need to take time to process so the connection

2
requirements.txt
View File

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