Skip to content

Commit

Permalink
Monkey patch original current_thread _active
Browse files Browse the repository at this point in the history
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: Ifc6420d927c0ce9e04ff3b3253e81a474591e9bb
Closes-Bug: #1863021
(cherry picked from commit 5e9f694)
(cherry picked from commit 7196cfc)
  • Loading branch information
Corey Bryant authored and gouthampacha committed Jul 27, 2020
1 parent 60d343a commit 779ae5f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 0 deletions.
6 changes: 6 additions & 0 deletions manila/cmd/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,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

Expand Down
6 changes: 6 additions & 0 deletions manila/cmd/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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

Expand Down
6 changes: 6 additions & 0 deletions manila/cmd/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,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

Expand Down
6 changes: 6 additions & 0 deletions manila/cmd/share.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,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

Expand Down

0 comments on commit 779ae5f

Please sign in to comment.