openstack/oslo.concurrency
Code Issues Proposed changes

Remove workaround for eventlet bug #592

Browse Source 
This code worked around a bug in eventlet[1] that has been fixed in
6533958f5f. 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: I377f664b4e5092ee0e2a95a7e277f1c8a1e18953
This commit is contained in:
Takashi Kajinami 2024-09-27 23:45:01 +09:00
parent 248ba64794
commit dcc891427a
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oslo_concurrency/processutils.py
View File

@ -61,13 +61,6 @@ if eventlet_patched:
from eventlet.green import subprocess from eventlet.green import subprocess
from eventlet import tpool from eventlet import tpool
# 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
orig_threading.current_thread.__globals__['_active'] = threading._active
else: else:
import subprocess import subprocess

6
oslo_concurrency/tests/__init__.py
View File

@ -17,9 +17,3 @@ import os
if os.environ.get('TEST_EVENTLET'): if os.environ.get('TEST_EVENTLET'):
import eventlet import eventlet
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

4
setup.cfg
View File

@ -31,3 +31,7 @@ oslo.config.opts =
oslo.concurrency = oslo_concurrency.opts:list_opts oslo.concurrency = oslo_concurrency.opts:list_opts
console_scripts = console_scripts =
lockutils-wrapper = oslo_concurrency.lockutils:main lockutils-wrapper = oslo_concurrency.lockutils:main
[extras]
eventlet =
eventlet>=0.27.0 # MIT

2
test-requirements.txt
View File

@ -2,4 +2,4 @@ oslotest>=3.2.0 # Apache-2.0
coverage>=4.0 # Apache-2.0 coverage>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
stestr>=2.0.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0
eventlet>=0.19.0 # MIT eventlet>=0.27.0 # MIT