openstack/manila
Code Issues Proposed changes

Merge "Remove workaround for eventlet bug #592"

Browse Source
This commit is contained in:
Zuul 2024-11-19 19:05:33 +00:00 committed by Gerrit Code Review
commit 9b6b6feda9
5 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manila/cmd/api.py
View File

@ -20,12 +20,6 @@
import eventlet
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
import sys

6
manila/cmd/data.py
View File

@ -18,12 +18,6 @@
import eventlet
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
import sys

6
manila/cmd/scheduler.py
View File

@ -20,12 +20,6 @@
import eventlet
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
import sys

6
manila/cmd/share.py
View File

@ -19,12 +19,6 @@
import eventlet
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
import sys

2
requirements.txt
View File

@ -7,7 +7,7 @@ pbr>=5.5.0 # Apache-2.0
alembic>=1.4.2 # MIT
defusedxml>=0.7.1 # PSFL
eventlet>=0.26.1 # MIT
eventlet>=0.27.0 # MIT
greenlet>=0.4.16 # MIT
lxml>=4.5.2 # BSD
netaddr>=0.8.0 # BSD