openstack/barbican
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
6533958f5fcec8b1577f56834ea2dc75a4f211e3. 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: I2ccff0294555d63e7bfe68cf71253cfef82d0172
This commit is contained in:
Takashi Kajinami 2024-09-27 23:59:48 +09:00
parent 49c7ac543f
commit 6b4aaab242
4 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
barbican/cmd/keystone_listener.py
View File

@ -27,13 +27,6 @@ import sys
# To have remote debugging, thread module needs to be disabled. # To have remote debugging, thread module needs to be disabled.
# eventlet.monkey_patch(thread=False) # eventlet.monkey_patch(thread=False)
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
import threading # noqa
orig_threading.current_thread.__globals__['_active'] = threading._active
# 'Borrowed' from the Glance project: # 'Borrowed' from the Glance project:
# If ../barbican/__init__.py exists, add ../ to Python search path, so that # If ../barbican/__init__.py exists, add ../ to Python search path, so that

6
barbican/cmd/retry_scheduler.py
View File

@ -25,12 +25,6 @@ import sys
# Oslo messaging RPC server uses eventlet. # Oslo messaging RPC server uses 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
import threading # noqa
orig_threading.current_thread.__globals__['_active'] = threading._active
# 'Borrowed' from the Glance project: # 'Borrowed' from the Glance project:
# If ../barbican/__init__.py exists, add ../ to Python search path, so that # If ../barbican/__init__.py exists, add ../ to Python search path, so that

6
barbican/cmd/worker.py
View File

@ -25,12 +25,6 @@ import sys
# Oslo messaging RPC server uses eventlet. # Oslo messaging RPC server uses 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
import threading # noqa
orig_threading.current_thread.__globals__['_active'] = threading._active
# 'Borrowed' from the Glance project: # 'Borrowed' from the Glance project:
# If ../barbican/__init__.py exists, add ../ to Python search path, so that # If ../barbican/__init__.py exists, add ../ to Python search path, so that

2
requirements.txt
View File

@ -5,7 +5,7 @@
alembic>=0.8.10 # MIT alembic>=0.8.10 # MIT
cffi>=1.7.0 # MIT cffi>=1.7.0 # MIT
cryptography>=2.1 # BSD/Apache-2.0 cryptography>=2.1 # BSD/Apache-2.0
eventlet>=0.18.2,!=0.18.3,!=0.20.1 # MIT eventlet>=0.27.0 # MIT
jsonschema>=3.2.0 # MIT jsonschema>=3.2.0 # MIT
oslo.config>=6.4.0 # Apache-2.0 oslo.config>=6.4.0 # Apache-2.0
oslo.context>=2.22.0 # Apache-2.0 oslo.context>=2.22.0 # Apache-2.0