mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Don't use SSH's `-tt' flag because it doesn't seem to work

Browse source 
on OpenSolaris when using connection sharing.  Instead have
  the remote side check for disconnection and kill the process 
  group when that happens.
This commit is contained in:
Eelco Dolstra 2010-10-04 12:30:46 +00:00
parent 71dfe4b90b
commit bfa6ee7d91
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/build-remote.pl.in
View file

@ -4,6 +4,7 @@ use Fcntl ':flock';
use English '-no_match_vars'; use English '-no_match_vars';
use IO::Handle; use IO::Handle;
use ssh qw/sshOpts openSSHConnection/; use ssh qw/sshOpts openSSHConnection/;
no warnings('once');
# General operation: # General operation:
@ -230,12 +231,15 @@ system("NIX_SSHOPTS=\"@sshOpts\" @bindir@/nix-copy-closure $hostName $maybeSign
# Perform the build. # Perform the build.
my $buildFlags = "--max-silent-time $maxSilentTime --fallback --add-root $rootsDir/\$PPID.out --option verbosity 0"; my $buildFlags = "--max-silent-time $maxSilentTime --fallback --add-root $rootsDir/\$PPID.out --option verbosity 0";
# `-tt' forces allocation of a pseudo-terminal. This is required to # We let the remote side kill its process group when the connection is
# make the remote nix-store process receive a signal when the # closed unexpectedly. This is necessary to ensure that no processes
# connection dies. Without it, the remote process might continue to # are left running on the remote system if the local Nix process is
# run indefinitely (that is, until it next tries to write to # killed. (SSH itself doesn't kill child processes if the connection
# stdout/stderr). # is interrupted unless the `-tt' flag is used to force a pseudo-tty,
if (system("ssh $hostName @sshOpts -tt 'nix-store -r $drvPath $buildFlags > /dev/null' >&4") != 0) { # in which case every child receives SIGHUP; however, `-tt' doesn't
# work on some platforms when connection sharing is used.)
pipe STDIN, DUMMY; # make sure we have a readable STDIN
if (system("ssh $hostName @sshOpts '(read; kill -INT -\$\$) <&0 & nix-store -r $drvPath $buildFlags > /dev/null' 2>&4") != 0) {
# If we couldn't run ssh or there was an ssh problem (indicated by # If we couldn't run ssh or there was an ssh problem (indicated by
# exit code 255), then we return exit code 1; otherwise we assume # exit code 255), then we return exit code 1; otherwise we assume
# that the builder failed, which we indicate to Nix using exit # that the builder failed, which we indicate to Nix using exit