From 353feba0b0842e99145b35bde3787ee29516c727 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Fri, 27 Sep 2024 16:11:38 +0200 Subject: [PATCH] Remove workaround for eventlet bug #592 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 Change-Id: Ica7ac704ae358d0271562d3c02b4b56dfb7ded7f --- manila/cmd/api.py | 6 ------ manila/cmd/data.py | 6 ------ manila/cmd/scheduler.py | 6 ------ manila/cmd/share.py | 6 ------ requirements.txt | 2 +- 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/manila/cmd/api.py b/manila/cmd/api.py index 76e4687e18..dc49af3e92 100644 --- a/manila/cmd/api.py +++ b/manila/cmd/api.py @@ -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 diff --git a/manila/cmd/data.py b/manila/cmd/data.py index 91a284cb9d..1edba6c151 100644 --- a/manila/cmd/data.py +++ b/manila/cmd/data.py @@ -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 diff --git a/manila/cmd/scheduler.py b/manila/cmd/scheduler.py index a06d30d748..dbc5c3b1c1 100644 --- a/manila/cmd/scheduler.py +++ b/manila/cmd/scheduler.py @@ -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 diff --git a/manila/cmd/share.py b/manila/cmd/share.py index 7a8ac4f6ef..5bc65d398a 100644 --- a/manila/cmd/share.py +++ b/manila/cmd/share.py @@ -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 diff --git a/requirements.txt b/requirements.txt index f68430af18..797ba9e727 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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