summaryrefslogtreecommitdiff
path: root/heat/cmd/all.py
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-07-23 21:51:45 +0000
committerGerrit Code Review <review@openstack.org>2020-07-23 21:51:45 +0000
commitbcfb92d9272e40c0c67c4d9e93ea51f8515edf50 (patch)
tree2de940b3570f795e85703394eff43b33861951ed /heat/cmd/all.py
parent9ffb42da50f57173f4079d2b1dcf05f5eaa85707 (diff)
parent2e6ae73932e288952e52417d11818ed006f82bbc (diff)
downloadheat-bcfb92d9272e40c0c67c4d9e93ea51f8515edf50.tar.gz
Merge "Monkey patch original current_thread _active" into stable/ussuri
Diffstat (limited to 'heat/cmd/all.py')
-rw-r--r--heat/cmd/all.py6
1 files changed, 6 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