openstack/os-ken
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: I5b0e90fe0e7d0429c65254f2944b19bfefebe631
This commit is contained in:
Takashi Kajinami 2024-09-28 00:13:24 +09:00
parent 0309145258
commit 2760134689
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os_ken/lib/hub.py
View File

@ -51,13 +51,6 @@ if HUB_TYPE == 'eventlet':
def patch(thread=True): def patch(thread=True):
eventlet.monkey_patch(thread=thread) eventlet.monkey_patch(thread=thread)
if thread:
# 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 spawn(*args, **kwargs): def spawn(*args, **kwargs):
raise_error = kwargs.pop('raise_error', False) raise_error = kwargs.pop('raise_error', False)

2
requirements.txt
View File

@ -3,7 +3,7 @@
# you find any incorrect lower bounds, let us know or propose a fix. # you find any incorrect lower bounds, let us know or propose a fix.
pbr>=2.0.0 # Apache-2.0 pbr>=2.0.0 # Apache-2.0
eventlet>=0.26.1 # MIT eventlet>=0.27.0 # MIT
msgpack>=1.0.0 # RPC library, BGP speaker(net_cntl) msgpack>=1.0.0 # RPC library, BGP speaker(net_cntl)
ncclient>=0.6.13 # Apache-2.0 ncclient>=0.6.13 # Apache-2.0
netaddr>=0.7.18 # BSD netaddr>=0.7.18 # BSD