diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-23 21:51:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-23 21:51:45 +0000 |
| commit | bcfb92d9272e40c0c67c4d9e93ea51f8515edf50 (patch) | |
| tree | 2de940b3570f795e85703394eff43b33861951ed | |
| parent | 9ffb42da50f57173f4079d2b1dcf05f5eaa85707 (diff) | |
| parent | 2e6ae73932e288952e52417d11818ed006f82bbc (diff) | |
| download | heat-bcfb92d9272e40c0c67c4d9e93ea51f8515edf50.tar.gz | |
Merge "Monkey patch original current_thread _active" into stable/ussuri
| -rw-r--r-- | heat/cmd/all.py | 6 | ||||
| -rw-r--r-- | heat/cmd/api.py | 6 | ||||
| -rw-r--r-- | heat/cmd/api_cfn.py | 6 | ||||
| -rw-r--r-- | heat/cmd/engine.py | 6 |
4 files changed, 24 insertions, 0 deletions
diff --git a/heat/cmd/all.py b/heat/cmd/all.py index 526bc7fa2..d9c7dd0d6 100644 --- a/heat/cmd/all.py +++ b/heat/cmd/all.py @@ -20,6 +20,12 @@ 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 diff --git a/heat/cmd/api.py b/heat/cmd/api.py index b8ea0111c..4ab22b0d6 100644 --- a/heat/cmd/api.py +++ b/heat/cmd/api.py @@ -20,6 +20,12 @@ 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 diff --git a/heat/cmd/api_cfn.py b/heat/cmd/api_cfn.py index bc7cd5b02..2a44605e5 100644 --- a/heat/cmd/api_cfn.py +++ b/heat/cmd/api_cfn.py @@ -22,6 +22,12 @@ 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 diff --git a/heat/cmd/engine.py b/heat/cmd/engine.py index f30081d7e..b969a4c22 100644 --- a/heat/cmd/engine.py +++ b/heat/cmd/engine.py @@ -22,6 +22,12 @@ 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 |