openstack/heat
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: I2cf47cf2a348d85c0f943ef49796700ded0d5711
This commit is contained in:
Takashi Kajinami 2024-09-27 23:54:18 +09:00
parent ffa485a8e9
commit 3e63ba196a
5 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/cmd/all.py
View File

@ -20,12 +20,6 @@ An OpenStack Heat server that can run all services.
import eventlet
eventlet.monkey_patch(os=False)
# 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
heat/cmd/api.py
View File

@ -20,12 +20,6 @@ An OpenStack ReST API to Heat.
import eventlet
eventlet.monkey_patch(os=False)
# 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
heat/cmd/api_cfn.py
View File

@ -22,12 +22,6 @@ AMQP RPC to implement them.
import eventlet
eventlet.monkey_patch(os=False)
# 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
heat/cmd/engine.py
View File

@ -22,12 +22,6 @@ engine.
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

@ -2,7 +2,7 @@ pbr>=3.1.1 # Apache-2.0
alembic>=1.8.0 # MIT
croniter>=0.3.4 # MIT License
cryptography>=2.5 # BSD/Apache-2.0
eventlet>=0.18.2 # MIT
eventlet>=0.27.0 # MIT
keystoneauth1>=3.18.0 # Apache-2.0
keystonemiddleware>=5.1.0 # Apache-2.0
lxml>=4.5.0 # BSD