From 97f53bb54a6209bc917e1a5a727ea8f6333bafc1 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 5 May 2020 15:41:02 -0400 Subject: [PATCH] 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: https://github.com/eventlet/eventlet/issues/592 Change-Id: I0e8f80bb2e7acfb00e5ff47e0aa983afb7ee6e38 Closes-Bug: #1863021 (cherry picked from commit f2e41f2f659fc4490e55d3372cfbcebb295c8ad4) --- muranoagent/cmd/run.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/muranoagent/cmd/run.py b/muranoagent/cmd/run.py index cb02fcab..764f5643 100644 --- a/muranoagent/cmd/run.py +++ b/muranoagent/cmd/run.py @@ -32,6 +32,12 @@ if os.path.exists(os.path.join(possible_topdir, 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 from oslo_config import cfg