soenkehahn/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Prefer building on a remote machine over a local machine. This

Browse source 
makes more sense for the build farm, otherwise every nix-store
  invocation will lead to at least one local build.  Will come up with
  a better solution later...
This commit is contained in:
Eelco Dolstra 2008-12-04 16:35:47 +00:00
parent 9850262a72
commit bcfe98acff
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,8 +45,7 @@ mkdir $currentLoad, 0777 or die unless -d $currentLoad;
my $conf = $ENV{"NIX_REMOTE_SYSTEMS"}; my $conf = $ENV{"NIX_REMOTE_SYSTEMS"};
decline if !defined $conf || ! -e $conf; decline if !defined $conf || ! -e $conf;
# Decline if the local system can do the build. my $canBuildLocally = $amWilling && ($localSystem eq $neededSystem);
decline if $amWilling && ($localSystem eq $neededSystem);
# Otherwise find a willing remote machine. # Otherwise find a willing remote machine.
@ -89,7 +88,7 @@ LOOP: foreach my $cur (@machines) {
# We have a machine of the right type. Try to get a lock on # We have a machine of the right type. Try to get a lock on
# one of the machine's lock files. # one of the machine's lock files.
my $slot = 0; my $slot = 0;
while ($slot < $cur->{maxJobs} || $mustRun) { while ($slot < $cur->{maxJobs} || ($mustRun && !$canBuildLocally)) {
my $slotLock = "$currentLoad/" . $cur->{systemType} . "-" . $cur->{hostName} . "-$slot"; my $slotLock = "$currentLoad/" . $cur->{systemType} . "-" . $cur->{hostName} . "-$slot";
open SLOTLOCK, ">>$slotLock" or die; open SLOTLOCK, ">>$slotLock" or die;
if (flock(SLOTLOCK, LOCK_EX | LOCK_NB)) { if (flock(SLOTLOCK, LOCK_EX | LOCK_NB)) {
@ -107,9 +106,11 @@ LOOP: foreach my $cur (@machines) {
close MAINLOCK; close MAINLOCK;
# Didn't find one? # Didn't find one? Then decline or postpone.
if (!defined $machine) { if (!defined $machine) {
if ($rightType) { # Postpone if we have a machine of the right type, except if the
# local system can and wants to do the build.
if ($rightType && !$canBuildLocally) {
sendReply "postpone"; sendReply "postpone";
exit 0; exit 0;
} else { } else {