From e049c5014a634e37dd3108b27de9e582ead499fb Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 5 May 2020 15:55:12 -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: I98e80bcbc7637bbb6063935043e530718be87f7b
Closes-Bug: #1863021
(cherry picked from commit 84041d67b4c32ec74d270216e6cc0be4428f8291)
---
 mistral/cmd/launch.py | 6 ++++++
 tox.ini               | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mistral/cmd/launch.py b/mistral/cmd/launch.py
index ebff6d218..8df325b1c 100644
--- a/mistral/cmd/launch.py
+++ b/mistral/cmd/launch.py
@@ -25,6 +25,12 @@ eventlet.monkey_patch(
     socket=True,
     thread=False if '--use-debugger' in sys.argv else True,
     time=True)
+# 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 os
diff --git a/tox.ini b/tox.ini
index e87e0e35f..71f50719f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,7 +39,7 @@ commands = ./run_tests.sh -N --db-type mysql
 [testenv:pep8]
 commands =
   doc8 doc/source
-  flake8 {posargs} . {toxinidir}/tools/get_action_list.py {toxinidir}/tools/sync_db.py
+  flake8 {posargs} . {toxinidir}/tools/sync_db.py
 
 [testenv:cover]
 setenv =