diff --git a/glance/cmd/api.py b/glance/cmd/api.py index abeaeb663f..6ddd79240c 100644 --- a/glance/cmd/api.py +++ b/glance/cmd/api.py @@ -27,13 +27,6 @@ import sys import eventlet 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_utils import encodeutils diff --git a/glance/cmd/scrubber.py b/glance/cmd/scrubber.py index be64e105e7..fa64012c80 100644 --- a/glance/cmd/scrubber.py +++ b/glance/cmd/scrubber.py @@ -25,13 +25,6 @@ import sys import eventlet 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 # If ../glance/__init__.py exists, add ../ to Python search path, so that