From a4921b8ceb5bde3fbd1ae25ea4b367199796eded Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Jul 2013 12:52:16 +0200 Subject: Revert "build-remote.pl: Enforce timeouts locally" This reverts commit 69b8f9980f39c14a59365a188b300a34d625a2cd. The timeout should be enforced remotely. Otherwise, if the garbage collector is running either locally or remotely, if will block the build or closure copying for some time. If the garbage collector takes too long, the build may time out, which is not what we want. Also, on heavily loaded systems, copying large paths to and from the remote machine can take a long time, also potentially resulting in a timeout. --- scripts/build-remote.pl.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in index 413d0402bf7a..a4eee75d1b17 100755 --- a/scripts/build-remote.pl.in +++ b/scripts/build-remote.pl.in @@ -46,7 +46,7 @@ sub all { $_ || return 0 for @_; 1 } # Initialisation. my $loadIncreased = 0; -my ($localSystem, $printBuildTrace) = @ARGV; +my ($localSystem, $maxSilentTime, $printBuildTrace, $buildTimeout) = @ARGV; my $currentLoad = $ENV{"NIX_CURRENT_LOAD"}; my $conf = $ENV{"NIX_REMOTE_SYSTEMS"}; @@ -261,7 +261,8 @@ close UPLOADLOCK; # Perform the build. my $buildFlags = - " --fallback --add-root $rootsDir/\$PPID.out --quiet" + "--max-silent-time $maxSilentTime --option build-timeout $buildTimeout" + . " --fallback --add-root $rootsDir/\$PPID.out --quiet" . " --option build-keep-log false"; # We let the remote side kill its process group when the connection is -- cgit 1.4.1