From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Daniel P . Berrange" <berrange@redhat.com>
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Ani Sinha" <anisinha@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"John Snow" <jsnow@redhat.com>, "Fabiano Rosas" <farosas@suse.de>
Subject: [PATCH v5 16/44] tests/functional: Allow asset downloading with concurrent threads
Date: Fri, 30 Aug 2024 15:38:10 +0200 [thread overview]
Message-ID: <20240830133841.142644-17-thuth@redhat.com> (raw)
In-Reply-To: <20240830133841.142644-1-thuth@redhat.com>
When running "make -j$(nproc) check-functional", tests that use the
same asset might be running in parallel. Improve the downloading to
detect this situation and wait for the other thread to finish the
download.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/qemu_test/asset.py | 62 ++++++++++++++++++++++++-----
1 file changed, 51 insertions(+), 11 deletions(-)
diff --git a/tests/functional/qemu_test/asset.py b/tests/functional/qemu_test/asset.py
index b329ab7dbe..d3be2aff82 100644
--- a/tests/functional/qemu_test/asset.py
+++ b/tests/functional/qemu_test/asset.py
@@ -12,6 +12,7 @@
import sys
import unittest
import urllib.request
+from time import sleep
from pathlib import Path
from shutil import copyfileobj
@@ -55,6 +56,35 @@ def _check(self, cache_file):
def valid(self):
return self.cache_file.exists() and self._check(self.cache_file)
+ def _wait_for_other_download(self, tmp_cache_file):
+ # Another thread already seems to download the asset, so wait until
+ # it is done, while also checking the size to see whether it is stuck
+ try:
+ current_size = tmp_cache_file.stat().st_size
+ new_size = current_size
+ except:
+ if os.path.exists(self.cache_file):
+ return True
+ raise
+ waittime = lastchange = 600
+ while waittime > 0:
+ sleep(1)
+ waittime -= 1
+ try:
+ new_size = tmp_cache_file.stat().st_size
+ except:
+ if os.path.exists(self.cache_file):
+ return True
+ raise
+ if new_size != current_size:
+ lastchange = waittime
+ current_size = new_size
+ elif lastchange - waittime > 90:
+ return False
+
+ self.log.debug("Time out while waiting for %s!", tmp_cache_file)
+ raise
+
def fetch(self):
if not self.cache_dir.exists():
self.cache_dir.mkdir(parents=True, exist_ok=True)
@@ -70,18 +100,28 @@ def fetch(self):
self.log.info("Downloading %s to %s...", self.url, self.cache_file)
tmp_cache_file = self.cache_file.with_suffix(".download")
- try:
- resp = urllib.request.urlopen(self.url)
- except Exception as e:
- self.log.error("Unable to download %s: %s", self.url, e)
- raise
+ for retries in range(3):
+ try:
+ with tmp_cache_file.open("xb") as dst:
+ with urllib.request.urlopen(self.url) as resp:
+ copyfileobj(resp, dst)
+ break
+ except FileExistsError:
+ self.log.debug("%s already exists, "
+ "waiting for other thread to finish...",
+ tmp_cache_file)
+ if self._wait_for_other_download(tmp_cache_file):
+ return str(self.cache_file)
+ self.log.debug("%s seems to be stale, "
+ "deleting and retrying download...",
+ tmp_cache_file)
+ tmp_cache_file.unlink()
+ continue
+ except Exception as e:
+ self.log.error("Unable to download %s: %s", self.url, e)
+ tmp_cache_file.unlink()
+ raise
- try:
- with tmp_cache_file.open("wb+") as dst:
- copyfileobj(resp, dst)
- except:
- tmp_cache_file.unlink()
- raise
try:
# Set these just for informational purposes
os.setxattr(str(tmp_cache_file), "user.qemu-asset-url",
--
2.46.0
next prev parent reply other threads:[~2024-08-30 13:40 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-30 13:37 [PATCH v5 00/44] Convert avocado tests to normal Python unittests Thomas Huth
2024-08-30 13:37 ` [PATCH v5 01/44] tests/avocado: machine aarch64: standardize location and RO access Thomas Huth
2024-08-30 13:37 ` [PATCH v5 02/44] tests/avocado/boot_xen.py: fetch kernel during test setUp() Thomas Huth
2024-08-30 13:37 ` [PATCH v5 03/44] tests/avocado/machine_aarch64_sbsaref.py: allow for rw usage of image Thomas Huth
2024-08-30 13:37 ` [PATCH v5 04/44] Bump avocado to 103.0 Thomas Huth
2024-08-30 13:37 ` [PATCH v5 05/44] tests/avocado/avocado_qemu: Fix the "from" statements in linuxtest.py Thomas Huth
2024-08-30 13:38 ` [PATCH v5 06/44] tests/avocado/boot_linux_console: Remove the s390x subtest Thomas Huth
2024-08-30 13:38 ` [PATCH v5 07/44] python: Install pycotap in our venv if necessary Thomas Huth
2024-08-30 13:38 ` [PATCH v5 08/44] tests/functional: Add base classes for the upcoming pytest-based tests Thomas Huth
2024-08-30 13:38 ` [PATCH v5 09/44] tests/functional: Set up logging Thomas Huth
2024-08-30 13:38 ` [PATCH v5 10/44] tests/Makefile.include: Increase the level of indentation in the help text Thomas Huth
2024-08-30 13:38 ` [PATCH v5 11/44] tests/functional: Prepare the meson build system for the functional tests Thomas Huth
2024-08-30 13:38 ` [PATCH v5 12/44] tests/functional: Convert simple avocado tests into standalone python tests Thomas Huth
2024-08-30 13:38 ` [PATCH v5 13/44] tests/functional: Convert avocado tests that just need a small adjustment Thomas Huth
2024-08-30 13:38 ` [PATCH v5 14/44] tests/functional: add a module for handling asset download & caching Thomas Huth
2024-09-02 8:42 ` Philippe Mathieu-Daudé
2024-08-30 13:38 ` [PATCH v5 15/44] tests/functional: enable pre-emptive caching of assets Thomas Huth
2024-08-30 13:38 ` Thomas Huth [this message]
2024-08-30 13:38 ` [PATCH v5 17/44] tests/functional: Convert some tests that download files via fetch_asset() Thomas Huth
2024-09-04 9:08 ` Thomas Huth
2024-08-30 13:38 ` [PATCH v5 18/44] tests/functional: Add a function for extracting files from an archive Thomas Huth
2024-08-30 13:38 ` [PATCH v5 19/44] tests/functional: Convert some avocado tests that needed avocado.utils.archive Thomas Huth
2024-08-30 13:38 ` [PATCH v5 20/44] tests/functional: Convert the s390x avocado tests into standalone tests Thomas Huth
2024-08-30 13:38 ` [PATCH v5 21/44] tests/functional: Convert the x86_cpu_model_versions test Thomas Huth
2024-08-30 13:38 ` [PATCH v5 22/44] tests/functional: Convert the microblaze avocado tests into standalone tests Thomas Huth
2024-08-30 13:38 ` [PATCH v5 23/44] tests/functional: Convert the riscv_opensbi avocado test into a standalone test Thomas Huth
2024-09-02 8:45 ` Philippe Mathieu-Daudé
2024-08-30 13:38 ` [PATCH v5 24/44] tests/functional: Convert the virtio_gpu " Thomas Huth
2024-08-30 13:38 ` [PATCH v5 25/44] tests/functional: Convert most ppc avocado tests into standalone tests Thomas Huth
2024-09-02 9:33 ` Philippe Mathieu-Daudé
2024-08-30 13:38 ` [PATCH v5 26/44] tests/functional: Convert the ppc_amiga avocado test into a standalone test Thomas Huth
2024-08-30 13:38 ` [PATCH v5 27/44] tests/functional: Convert the ppc_hv " Thomas Huth
2024-08-30 13:38 ` [PATCH v5 28/44] tests/functional: Convert the m68k nextcube test with tesseract Thomas Huth
2024-08-30 13:38 ` [PATCH v5 29/44] tests/functional: Convert the acpi-bits test into a standalone test Thomas Huth
2024-08-30 13:38 ` [PATCH v5 30/44] tests/functional: Convert the rx_gdbsim avocado " Thomas Huth
2024-08-30 13:38 ` [PATCH v5 31/44] tests/functional: Convert the linux_initrd " Thomas Huth
2024-08-30 13:38 ` [PATCH v5 32/44] tests/functional: Convert the vnc test Thomas Huth
2024-09-02 9:48 ` Philippe Mathieu-Daudé
2024-09-02 10:23 ` Thomas Huth
2024-09-03 13:45 ` Philippe Mathieu-Daudé
2024-09-03 14:14 ` Philippe Mathieu-Daudé
2024-08-30 13:38 ` [PATCH v5 33/44] tests/functional: Convert ARM Integrator/CP avocado tests Thomas Huth
2024-08-30 13:38 ` [PATCH v5 34/44] tests/functional: Convert Aarch64 SBSA-Ref " Thomas Huth
2024-09-03 13:51 ` Philippe Mathieu-Daudé
2024-08-30 13:38 ` [PATCH v5 35/44] tests/functional: Convert Aarch64 Virt machine " Thomas Huth
2024-08-30 13:38 ` [PATCH v5 36/44] tests/functional: Convert mips64el Fuloong2e avocado test (1/2) Thomas Huth
2024-08-30 13:38 ` [PATCH v5 37/44] tests/functional: Add QemuUserTest class Thomas Huth
2024-08-30 13:38 ` [PATCH v5 38/44] tests/functional: Convert ARM bFLT linux-user avocado test Thomas Huth
2024-08-30 13:38 ` [PATCH v5 39/44] tests/avocado: Remove unused QemuUserTest class Thomas Huth
2024-08-30 13:38 ` [PATCH v5 40/44] gitlab-ci: Add "check-functional" to the build tests Thomas Huth
2024-08-30 13:38 ` [PATCH v5 41/44] docs/devel: Split testing docs from the build docs and move to separate folder Thomas Huth
2024-08-30 13:38 ` [PATCH v5 42/44] docs/devel/testing: Split the Avocado documentation into a separate file Thomas Huth
2024-08-30 13:38 ` [PATCH v5 43/44] docs/devel/testing: Rename avocado_qemu.Test class Thomas Huth
2024-08-30 13:38 ` [PATCH v5 44/44] docs/devel/testing: Add documentation for functional tests Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240830133841.142644-17-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=anisinha@redhat.com \
--cc=berrange@redhat.com \
--cc=farosas@suse.de \
--cc=jsnow@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).