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

Add separate build step status codes for cached failures and timeouts

Browse source
This commit is contained in:
Eelco Dolstra 2013-05-09 22:13:01 +00:00
parent a6d8566faf
commit 102359bf44
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/root/build.tt
View file

@ -50,6 +50,10 @@
Succeeded Succeeded
[% ELSIF step.status == 4 %] [% ELSIF step.status == 4 %]
<span class="error">Aborted</span> <span class="error">Aborted</span>
[% ELSIF step.status == 7 %]
<span class="error">Timed out</span>
[% ELSIF step.status == 8 %]
<span class="error">Cached failure</span>
[% ELSE %] [% ELSE %]
<span class="error">Failed: [% HTML.escape(step.errormsg) %]</span> <span class="error">Failed: [% HTML.escape(step.errormsg) %]</span>
[% END %] [% END %]

23
src/script/hydra-build
View file

@ -37,7 +37,7 @@ sub nextFreeStepNr {
sub failDependents { sub failDependents {
my ($drvPath, $errorMsg, $dependents) = @_; my ($drvPath, $status, $errorMsg, $dependents) = @_;
# Get the referrer closure of $drvPath. # Get the referrer closure of $drvPath.
my @dependentDrvs = computeFSClosure(1, 0, $drvPath); my @dependentDrvs = computeFSClosure(1, 0, $drvPath);
@ -67,7 +67,7 @@ sub failDependents {
, type => 0 # = build , type => 0 # = build
, drvpath => $drvPath , drvpath => $drvPath
, busy => 0 , busy => 0
, status => 1 , status => $status
, starttime => time , starttime => time
, stoptime => time , stoptime => time
, errormsg => $errorMsg , errormsg => $errorMsg
@ -182,12 +182,19 @@ sub doBuild {
my $drvPathStep = $1; my $drvPathStep = $1;
$someBuildFailed = 1; $someBuildFailed = 1;
$thisBuildFailed = 1 if $drvPath eq $drvPathStep; $thisBuildFailed = 1 if $drvPath eq $drvPathStep;
my $errorMsg = $4; my $errorMsg;
$errorMsg = "build failed previously (cached)" if $3 eq "cached"; my $status = 1;
if ($3 eq "cached") {
$status = 8;
} elsif ($3 eq "timeout") {
$status = 7;
} else {
$errorMsg = $4;
}
txn_do($db, sub { txn_do($db, sub {
if ($buildSteps{$drvPathStep}) { if ($buildSteps{$drvPathStep}) {
my $step = $build->buildsteps->find({stepnr => $buildSteps{$drvPathStep}}) or die; my $step = $build->buildsteps->find({stepnr => $buildSteps{$drvPathStep}}) or die;
$step->update({busy => 0, status => 1, errormsg => $errorMsg, stoptime => time}); $step->update({busy => 0, status => $status, errormsg => $errorMsg, stoptime => time});
} }
# Don't write a record if this derivation already # Don't write a record if this derivation already
# failed previously. This can happen if this is a # failed previously. This can happen if this is a
@ -198,7 +205,7 @@ sub doBuild {
, type => 0 # = build , type => 0 # = build
, drvpath => $drvPathStep , drvpath => $drvPathStep
, busy => 0 , busy => 0
, status => 1 , status => $status
, starttime => time , starttime => time
, stoptime => time , stoptime => time
, errormsg => $errorMsg , errormsg => $errorMsg
@ -208,7 +215,7 @@ sub doBuild {
}); });
# Immediately fail all builds that depend on this derivation. # Immediately fail all builds that depend on this derivation.
failDependents($drvPathStep, $errorMsg, $dependents); failDependents($drvPathStep, $status, $errorMsg, $dependents);
} }
elsif (/^@\s+substituter-started\s+(\S+)\s+(\S+)$/) { elsif (/^@\s+substituter-started\s+(\S+)\s+(\S+)$/) {
@ -254,7 +261,7 @@ sub doBuild {
if ($res != 0) { if ($res != 0) {
if ($thisBuildFailed && $res == 100 << 8) { $buildStatus = 1; } if ($thisBuildFailed && $res == 100 << 8) { $buildStatus = 1; }
elsif ($someBuildFailed) { $buildStatus = 2; } elsif (!$thisBuildFailed && $someBuildFailed) { $buildStatus = 2; }
else { $buildStatus = 3; } else { $buildStatus = 3; }
} }

8
src/sql/hydra.sql
View file

@ -208,7 +208,13 @@ create table BuildSteps (
busy integer not null, busy integer not null,
status integer, -- 0 = success, 1 = failed -- Status codes:
-- 0 = succeeded
-- 1 = failed normally
-- 4 = aborted
-- 7 = timed out
-- 8 = cached failure
status integer,
errorMsg text, errorMsg text,