From 69bdbfb6e97e53998d5a30c60f621131d899d47e Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Fri, 7 Jul 2023 13:02:15 -0700 Subject: [PATCH] Fully monkey patch eventlet for consistent behavior Eventlet expects to have green versions of every module loaded, including OS. The reasons we originally did not patch os are lost to time, but there have been many releases of eventlet since, and we should return to a reasonable baseline. Change-Id: Ia4113124b415bd647e3c984e587828eb5b612eee --- ironic/cmd/__init__.py | 2 +- ironic/tests/unit/__init__.py | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ironic/cmd/__init__.py b/ironic/cmd/__init__.py index 403f918d99..b3e9697329 100644 --- a/ironic/cmd/__init__.py +++ b/ironic/cmd/__init__.py @@ -23,7 +23,7 @@ os.environ['EVENTLET_NO_GREENDNS'] = 'yes' import eventlet -eventlet.monkey_patch(os=False) +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 diff --git a/ironic/tests/unit/__init__.py b/ironic/tests/unit/__init__.py index a83ef31e8c..9b42693939 100644 --- a/ironic/tests/unit/__init__.py +++ b/ironic/tests/unit/__init__.py @@ -30,7 +30,7 @@ from oslo_log import log from ironic import objects -eventlet.monkey_patch(os=False) +eventlet.monkey_patch() log.register_options(cfg.CONF) log.setup(cfg.CONF, 'ironic') diff --git a/requirements.txt b/requirements.txt index 2f4813baae..f8b1fb37fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ pbr>=3.1.1 # Apache-2.0 SQLAlchemy>=1.4.0 # MIT alembic>=1.4.2 # MIT automaton>=1.9.0 # Apache-2.0 -eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT +eventlet>=0.30.1 # MIT WebOb>=1.7.1 # MIT python-cinderclient!=4.0.0,>=3.3.0 # Apache-2.0 python-glanceclient>=2.8.0 # Apache-2.0