Skip to content

add default download timeout #4226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 4 commits into from
Mar 20, 2023
Merged

add default download timeout #4226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51c0054
add default download timeout
Mar 17, 2023
74721d9
add missing import
Mar 17, 2023
96838b9
fix line too long
Mar 17, 2023
4140cc2
more fixes
Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion easybuild/tools/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
DEFAULT_CONT_TYPE = CONT_TYPE_SINGULARITY

DEFAULT_BRANCH = 'develop'
DEFAULT_DOWNLOAD_TIMEOUT = 10
DEFAULT_ENV_FOR_SHEBANG = '/usr/bin/env'
DEFAULT_ENVVAR_USERS_MODULES = 'HOME'
DEFAULT_INDEX_MAX_AGE = 7 * 24 * 60 * 60 # 1 week (in seconds)
Expand Down Expand Up @@ -209,7 +210,6 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
'cuda_cache_dir',
'cuda_cache_maxsize',
'cuda_compute_capabilities',
'download_timeout',
'dump_test_report',
'easyblock',
'envvars_user_modules',
Expand Down Expand Up @@ -348,6 +348,9 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
DEFAULT_BRANCH: [
'pr_target_branch',
],
DEFAULT_DOWNLOAD_TIMEOUT: [
'download_timeout',
],
DEFAULT_ENV_FOR_SHEBANG: [
'env_for_shebang',
],
Expand Down
4 changes: 0 additions & 4 deletions easybuild/tools/filetools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,10 +753,6 @@ def download_file(filename, url, path, forced=False):
_log.debug("Trying to download %s from %s to %s", filename, url, path)

timeout = build_option('download_timeout')
if timeout is None:
# default to 10sec timeout if none was specified
# default system timeout (used is nothing is specified) may be infinite (?)
timeout = 10
_log.debug("Using timeout of %s seconds for initiating download" % timeout)

# parse option HTTP header fields for URLs containing a pattern
Expand Down
6 changes: 4 additions & 2 deletions easybuild/tools/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
from easybuild.tools.build_log import init_logging, log_start, print_msg, print_warning, raise_easybuilderror
from easybuild.tools.config import CHECKSUM_PRIORITY_CHOICES, DEFAULT_CHECKSUM_PRIORITY
from easybuild.tools.config import CONT_IMAGE_FORMATS, CONT_TYPES, DEFAULT_CONT_TYPE, DEFAULT_ALLOW_LOADED_MODULES
from easybuild.tools.config import DEFAULT_BRANCH, DEFAULT_ENV_FOR_SHEBANG, DEFAULT_ENVVAR_USERS_MODULES
from easybuild.tools.config import DEFAULT_BRANCH, DEFAULT_DOWNLOAD_TIMEOUT
from easybuild.tools.config import DEFAULT_ENV_FOR_SHEBANG, DEFAULT_ENVVAR_USERS_MODULES
from easybuild.tools.config import DEFAULT_FORCE_DOWNLOAD, DEFAULT_INDEX_MAX_AGE, DEFAULT_JOB_BACKEND
from easybuild.tools.config import DEFAULT_JOB_EB_CMD, DEFAULT_LOGFILE_FORMAT, DEFAULT_MAX_FAIL_RATIO_PERMS
from easybuild.tools.config import DEFAULT_MINIMAL_BUILD_ENV, DEFAULT_MNS, DEFAULT_MODULE_SYNTAX, DEFAULT_MODULES_TOOL
Expand Down Expand Up @@ -392,7 +393,8 @@ def override_options(self):
'detect-loaded-modules': ("Detect loaded EasyBuild-generated modules, act accordingly; "
"supported values: %s" % ', '.join(LOADED_MODULES_ACTIONS), None, 'store', WARN),
'devel': ("Enable including of development log messages", None, 'store_true', False),
'download-timeout': ("Timeout for initiating downloads (in seconds)", float, 'store', None),
'download-timeout': ("Timeout for initiating downloads (in seconds)", float, 'store',
DEFAULT_DOWNLOAD_TIMEOUT),
'dump-autopep8': ("Reformat easyconfigs using autopep8 when dumping them", None, 'store_true', False),
'easyblock': ("easyblock to use for processing the spec file or dumping the options",
None, 'store', None, 'e', {'metavar': 'CLASS'}),
Expand Down