openstack/glance
Code Issues Proposed changes

Merge "Remove workaround for eventlet bug #592"

Browse Source
This commit is contained in:
Zuul 2024-11-15 05:11:22 +00:00 committed by Gerrit Code Review
commit 5167b21c60
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glance/cmd/api.py
View File

@ -27,13 +27,6 @@ import sys
import eventlet import eventlet
eventlet.patcher.monkey_patch() eventlet.patcher.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
orig_threading.current_thread.__globals__['_active'] = threading._active
from oslo_reports import guru_meditation_report as gmr from oslo_reports import guru_meditation_report as gmr
from oslo_utils import encodeutils from oslo_utils import encodeutils

7
glance/cmd/scrubber.py
View File

@ -25,13 +25,6 @@ import sys
import eventlet import eventlet
eventlet.patcher.monkey_patch() eventlet.patcher.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
orig_threading.current_thread.__globals__['_active'] = threading._active
import subprocess import subprocess
# If ../glance/__init__.py exists, add ../ to Python search path, so that # If ../glance/__init__.py exists, add ../ to Python search path, so that