aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2018-07-28 12:24:20 +0000
committerPascal Terjan <pterjan@mageia.org>2018-07-28 12:24:20 +0000
commit4762dd27f8a5b91afaf2ac72edde49ffc0ecc7f1 (patch)
treecd1def38bdc1b4d3b90df8e219f3283363ae9332
parent4add103fc216beb2f5220cc2174622aa78080612 (diff)
downloadiurt-4762dd27f8a5b91afaf2ac72edde49ffc0ecc7f1.tar
iurt-4762dd27f8a5b91afaf2ac72edde49ffc0ecc7f1.tar.gz
iurt-4762dd27f8a5b91afaf2ac72edde49ffc0ecc7f1.tar.bz2
iurt-4762dd27f8a5b91afaf2ac72edde49ffc0ecc7f1.tar.xz
iurt-4762dd27f8a5b91afaf2ac72edde49ffc0ecc7f1.zip
Allow disabling build_stalled_timeout
-rw-r--r--NEWS1
-rw-r--r--lib/Iurt/Process.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 44697f7..8bb1d84 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- increase default timeout for commands to 10 minutes
- consider build fail after faildelay even if machine is unreachable
+- allow disabling build_stalled_timeout
0.7.5
- iurt: fix checking if chroot needs updating
diff --git a/lib/Iurt/Process.pm b/lib/Iurt/Process.pm
index 131a5a6..dc25f99 100644
--- a/lib/Iurt/Process.pm
+++ b/lib/Iurt/Process.pm
@@ -106,7 +106,7 @@ sub fork_to_monitor {
kill 14, "-$parent_pid";
exit();
}
- if ($stat[9] && $stat[9] + $opt{stalled_timeout} < time()) {
+ if ($opt{stalled_timeout} && $stat[9] && $stat[9] + $opt{stalled_timeout} < time()) {
# If nothing was written to the logfile for more than stalled_timeout, check if the system seems busy
if ((getload())[1] < 0.5) {
plog('ERROR', "Killing current command because it seems blocked");