From 05a0af71b8008685935fb8cca0d971db65fa50cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Thu, 21 Aug 2025 12:30:35 +0200 Subject: [PATCH] Use time.sleep() instead of eventlet.sleep() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit https://opendev.org/openstack/python-cinderclient/commit/9df662e053a42afa667706d542f2896e288d69ab https://gibizer.github.io/posts/Eventlet-Removal-The-First-Threading-Bug/ Change-Id: I440adc104d43e0b1077100701767695ac53593eb Signed-off-by: Cédric Ollivier --- docker/core/9df662e053.patch | 37 +++++++++++++++++++++++++++ docker/core/Dockerfile | 4 ++- docs/testing/user/configguide/configguide.rst | 10 ++++---- 3 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 docker/core/9df662e053.patch diff --git a/docker/core/9df662e053.patch b/docker/core/9df662e053.patch new file mode 100644 index 000000000..5124ba37b --- /dev/null +++ b/docker/core/9df662e053.patch @@ -0,0 +1,37 @@ +From 9df662e053a42afa667706d542f2896e288d69ab Mon Sep 17 00:00:00 2001 +From: Cyril Roelandt +Date: Tue, 12 Nov 2024 23:01:12 +0100 +Subject: [PATCH] Use time.sleep() instead of eventlet.sleep() + +In a patched environment, time.sleep will be eventlet.sleep, so this +does not have any actual impact, but it removes one direct dependency on +eventlet. + +Change-Id: I54112d061fa8118a9a6d91abf07442d8834425b5 +--- + cinderclient/client.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/cinderclient/client.py b/cinderclient/client.py +index c99a2e7a6..f065c9fc9 100644 +--- a/cinderclient/client.py ++++ b/cinderclient/client.py +@@ -25,6 +25,7 @@ import logging + import os + import pkgutil + import re ++from time import sleep + import urllib + from urllib import parse as urlparse + +@@ -42,10 +43,6 @@ from cinderclient import api_versions + from cinderclient import exceptions + import cinderclient.extension + +-try: +- from eventlet import sleep +-except ImportError: +- from time import sleep + + try: + osprofiler_web = importutils.try_import("osprofiler.web") diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 786fc7eab..8697e0e35 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,6 +5,7 @@ ARG OPENSTACK_TAG=unmaintained/zed COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-test_create_backup.patch +COPY 9df662e053.patch /tmp/9df662e053.patch RUN apk -U upgrade && \ apk --no-cache add --update \ python3 py3-wheel libffi openssl libjpeg-turbo py3-pip bash \ @@ -34,6 +35,7 @@ RUN apk -U upgrade && \ pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \ -e /src/functest && \ (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ + (cd /usr/lib/python3.10/site-packages/cinderclient && patch -p2 < /tmp/9df662e053.patch) && \ sed -i -E /#egg=rally/d /src/functest/upper-constraints.txt && \ sed -i -E /#egg=tempest/d /src/functest/upper-constraints.txt && \ (cd /src/tempest && \ @@ -42,7 +44,7 @@ RUN apk -U upgrade && \ patch -p1 < /tmp/Create-new-server-in-test_create_backup.patch && \ git commit -a -m "Backport critical bugfixes" && \ rm ~/.gitconfig) && \ - rm -r /src/requirements/.git /src/functest/.git \ + rm -r /src/requirements/.git /src/functest/.git /tmp/9df662e053.patch \ /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch \ /tmp/Create-new-server-in-test_create_backup.patch && \ mkdir -p /etc/xtesting && \ diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst index 24c297c95..f6ce72665 100644 --- a/docs/testing/user/configguide/configguide.rst +++ b/docs/testing/user/configguide/configguide.rst @@ -102,7 +102,7 @@ Run smoke suite:: sudo docker run --env-file env \ -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \ -v $(pwd)/images:/home/opnfv/functest/images \ - opnfv/functest-smoke + opnfv/functest-smoke:yoga Results shall be displayed as follows:: @@ -140,7 +140,7 @@ Run smoke-cntt suite:: sudo docker run --env-file env \ -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \ -v $(pwd)/images:/home/opnfv/functest/images \ - opnfv/functest-smoke-cntt + opnfv/functest-smoke-cntt:yoga Results shall be displayed as follows:: @@ -165,7 +165,7 @@ Run benchmarking suite:: sudo docker run --env-file env \ -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \ -v $(pwd)/images:/home/opnfv/functest/images \ - opnfv/functest-benchmarking + opnfv/functest-benchmarking:yoga Results shall be displayed as follows:: @@ -189,7 +189,7 @@ Run benchmarking-cntt suite:: sudo docker run --env-file env \ -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \ -v $(pwd)/images:/home/opnfv/functest/images \ - opnfv/functest-benchmarking-cntt + opnfv/functest-benchmarking-cntt:yoga Results shall be displayed as follows:: @@ -210,7 +210,7 @@ Run vnf suite:: sudo docker run --env-file env \ -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \ -v $(pwd)/images:/home/opnfv/functest/images \ - opnfv/functest-vnf + opnfv/functest-vnf:yoga Results shall be displayed as follows:: -- 2.16.6