From e4c2f884cb2b25ee4edd9019fbead910b9175d00 Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Fri, 3 May 2024 07:57:27 -0700 Subject: [PATCH] Remove eventlet workarounds The bugs these work around have been fixed for a long time, and we require modern eventlet for Ironic. Let's remove the workaround. Change-Id: Idecb3c5a774aecc6b65d0abd0262fe4b8625c6b7 --- ironic/cmd/__init__.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ironic/cmd/__init__.py b/ironic/cmd/__init__.py index b3e9697329..e55402f1b9 100644 --- a/ironic/cmd/__init__.py +++ b/ironic/cmd/__init__.py @@ -12,25 +12,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -# NOTE(yuriyz): Do eventlet monkey patching here, instead of in -# ironic/__init__.py. This allows the API service to run without monkey -# patching under Apache (which uses its own concurrency model). Mixing -# concurrency models can cause undefined behavior and potentially API timeouts. -import os - -os.environ['EVENTLET_NO_GREENDNS'] = 'yes' - 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 -# all the noqa below are for I202 due to 'import eventlet' above -import __original_module_threading as orig_threading # noqa -import threading # noqa -orig_threading.current_thread.__globals__['_active'] = threading._active from ironic.common import i18n # noqa