Monkey patch original current_thread _active

Monkey patch the original current_thread to use the up-to-date _active global variable. This solution is based on that documented at: eventlet/eventlet#592 Change-Id: I0540923755ac3969b584eeba2e19c037a7f2c261 Story: 2007614 (cherry picked from commit 8fd1721)
openstack · May 12, 2020 · 2e6ae73 · 2e6ae73
1 parent bceca61
commit 2e6ae73
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/heat/cmd/all.py b/heat/cmd/all.py
@@ -20,6 +20,12 @@
 
 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
@@ -20,6 +20,12 @@
 
 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
@@ -22,6 +22,12 @@
 
 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
@@ -22,6 +22,12 @@
 
 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