napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[shellprocess] Bump the default timeout to 30, emphasise tuning the timeout

Browse Source 
FIXES #1536
This commit is contained in:
Adriaan de Groot 2020-10-14 23:26:49 +02:00
parent 0b61a02c31
commit 7734d84925
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/shellprocess/ShellProcessJob.cpp
View File

@ -60,10 +60,10 @@ void
ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap ) ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
{ {
bool dontChroot = CalamaresUtils::getBool( configurationMap, "dontChroot", false ); bool dontChroot = CalamaresUtils::getBool( configurationMap, "dontChroot", false );
qint64 timeout = CalamaresUtils::getInteger( configurationMap, "timeout", 10 ); qint64 timeout = CalamaresUtils::getInteger( configurationMap, "timeout", 30 );
if ( timeout < 1 ) if ( timeout < 1 )
{ {
timeout = 10; timeout = 30;
} }
if ( configurationMap.contains( "script" ) ) if ( configurationMap.contains( "script" ) )

15
src/modules/shellprocess/shellprocess.conf
View File

@ -15,7 +15,16 @@
# #
# The (global) timeout for the command list can be set with # The (global) timeout for the command list can be set with
# the *timeout* key. The value is a time in seconds, default # the *timeout* key. The value is a time in seconds, default
# is 10 seconds if not set. # is 30 seconds if not set. The timeout **must** be tuned, either
# globally or per-command (see below in the description of *script*),
# to the load or expected running-time of the command.
#
# - Setting a timeout of 30 for a `touch` command is probably exessive
# - Setting a timeout of 1 for a `touch` command might be low,
# on a slow disk where touch needs to be loaded from CDROM
# - Setting a timeout of 30 for a 1GB download is definitely low
# - Setting a timeout of 3600 for a 1GB download is going to leave
# the user in uncertainty for a loooong time.
# #
# If a command starts with "-" (a single minus sign), then the # If a command starts with "-" (a single minus sign), then the
# return value of the command following the - is ignored; otherwise, # return value of the command following the - is ignored; otherwise,
@ -40,8 +49,10 @@
# #
# To change the description of the job, set the *name* entries in *i18n*. # To change the description of the job, set the *name* entries in *i18n*.
--- ---
# Set to true to run in host, rather than target system
dontChroot: false dontChroot: false
timeout: 10 # Tune this for the commands you're actually running
# timeout: 10
# Script may be a single string (because false returns an error exit # Script may be a single string (because false returns an error exit
# code, this will trigger a failure in the installation): # code, this will trigger a failure in the installation):