From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Wed, 28 May 2025 21:45:01 +0000 (+0200) Subject: gh-134262: Add retries to downloads in PCbuild\get_external.py (GH-134820) X-Git-Tag: v3.13.4~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=029eceaf058b6985f5a9d56ea62472833c35b1fb;p=thirdparty%2FPython%2Fcpython.git gh-134262: Add retries to downloads in PCbuild\get_external.py (GH-134820) (cherry picked from commit e9d845b41dca9ad84b76ef777d05e647a4b4d8cd) Co-authored-by: Emma Smith --- diff --git a/PCbuild/get_external.py b/PCbuild/get_external.py index 4ecc8925349c..99aff63882f5 100755 --- a/PCbuild/get_external.py +++ b/PCbuild/get_external.py @@ -9,6 +9,25 @@ import zipfile from urllib.request import urlretrieve +def retrieve_with_retries(download_location, output_path, reporthook, + max_retries=7): + """Download a file with exponential backoff retry and save to disk.""" + for attempt in range(max_retries): + try: + resp = urlretrieve( + download_location, + output_path, + reporthook=reporthook, + ) + except ConnectionError as ex: + if attempt == max_retries: + msg = f"Download from {download_location} failed." + raise OSError(msg) from ex + time.sleep(2.25**attempt) + else: + return resp + + def fetch_zip(commit_hash, zip_dir, *, org='python', binary=False, verbose): repo = f'cpython-{"bin" if binary else "source"}-deps' url = f'https://github.com/{org}/{repo}/archive/{commit_hash}.zip' @@ -16,10 +35,10 @@ def fetch_zip(commit_hash, zip_dir, *, org='python', binary=False, verbose): if verbose: reporthook = print zip_dir.mkdir(parents=True, exist_ok=True) - filename, headers = urlretrieve( + filename, _headers = retrieve_with_retries( url, zip_dir / f'{commit_hash}.zip', - reporthook=reporthook, + reporthook ) return filename