ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

* Add a NarSize field to Hydra manifests. This allows nix-env

Browse Source 
to predict how much disk space a package will require.
* Compute the output / closure size using the info stored in the
  Nix database (rather than doing a slow "du").
This commit is contained in:
Eelco Dolstra
2010-11-19 15:44:20 +00:00
parent ba31684153
commit a93e272364
4 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/script/hydra_build.pl.in
View File

@ -199,10 +199,6 @@ sub sendEmailNotification {
sendmail($email);
}
sub getSize {
my $size = `du -bcs @_ 2> /dev/null | tail -1 | cut -f 1 `;
return int($size);
}
sub doBuild {
my ($build) = @_;
@ -233,7 +229,7 @@ sub doBuild {
# Run Nix to perform the build, and monitor the stderr output
# to get notifications about specific build steps, the
# associated log files, etc.
my $cmd = "nix-store --realise $drvPath " .
my $cmd = "nix-store -j1 --no-build-hook --realise $drvPath " .
"--max-silent-time $maxsilent --keep-going --fallback " .
"--no-build-output --log-type flat --print-build-trace " .
"--add-root " . gcRootFor $outPath . " 2>&1";
@ -371,13 +367,20 @@ sub doBuild {
done:
my $logfile = getBuildLog($drvPath);
my $logsize = defined $logfile ? getSize($logfile) : 0;
my $size = isValidPath($outPath) ? getSize($outPath) : 0;
my $logsize = defined $logfile ? stat($logfile)->size : 0;
my $size = 0;
my $closuresize = 0;
if (isValidPath($outPath)) {
(my $hash, my $deriver, my $refs) = queryPathInfo($outPath) ;
$closuresize = getSize(@{$refs});
my ($deriver, $hash, $time, $narSize, $refs) = Nix::queryPathInfo($outPath);
$size = $narSize;
my @closure = Nix::computeFSClosure(0, 0, $outPath);
foreach my $path (@closure) {
my ($deriver, $hash, $time, $narSize, $refs) = Nix::queryPathInfo($path);
$closuresize += $narSize;
}
}
txn_do($db, sub {