Browse Source

Merge "Monkey patch original current_thread _active" into stable/train

tags/9.1.4^0
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
690c9ac250
4 changed files with 24 additions and 0 deletions
  1. +6
    -0
      manila/cmd/api.py
  2. +6
    -0
      manila/cmd/data.py
  3. +6
    -0
      manila/cmd/scheduler.py
  4. +6
    -0
      manila/cmd/share.py

+ 6
- 0
manila/cmd/api.py View File

@@ -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



+ 6
- 0
manila/cmd/data.py View File

@@ -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



+ 6
- 0
manila/cmd/scheduler.py View File

@@ -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



+ 6
- 0
manila/cmd/share.py View File

@@ -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



Loading…
Cancel
Save