From 102359bf4413f54ff89563727fbcfbe546f15a86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 May 2013 22:13:01 +0000
Subject: [PATCH] Add separate build step status codes for cached failures and
 timeouts

---
 src/root/build.tt      |  4 ++++
 src/script/hydra-build | 23 +++++++++++++++--------
 src/sql/hydra.sql      |  8 +++++++-
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/root/build.tt b/src/root/build.tt
index 53dd9ae0..8fdaea8a 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -50,6 +50,10 @@
                 Succeeded
               [% ELSIF step.status == 4 %]
                 <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 %]
                 <span class="error">Failed: [% HTML.escape(step.errormsg) %]</span>
               [% END %]
diff --git a/src/script/hydra-build b/src/script/hydra-build
index f487c9e3..3b9a3382 100755
--- a/src/script/hydra-build
+++ b/src/script/hydra-build
@@ -37,7 +37,7 @@ sub nextFreeStepNr {
 
 
 sub failDependents {
-    my ($drvPath, $errorMsg, $dependents) = @_;
+    my ($drvPath, $status, $errorMsg, $dependents) = @_;
 
     # Get the referrer closure of $drvPath.
     my @dependentDrvs = computeFSClosure(1, 0, $drvPath);
@@ -67,7 +67,7 @@ sub failDependents {
                 , type => 0 # = build
                 , drvpath => $drvPath
                 , busy => 0
-                , status => 1
+                , status => $status
                 , starttime => time
                 , stoptime => time
                 , errormsg => $errorMsg
@@ -182,12 +182,19 @@ sub doBuild {
                 my $drvPathStep = $1;
                 $someBuildFailed = 1;
                 $thisBuildFailed = 1 if $drvPath eq $drvPathStep;
-                my $errorMsg = $4;
-                $errorMsg = "build failed previously (cached)" if $3 eq "cached";
+                my $errorMsg;
+                my $status = 1;
+                if ($3 eq "cached") {
+                    $status = 8;
+                } elsif ($3 eq "timeout") {
+                    $status = 7;
+                } else {
+                    $errorMsg = $4;
+                }
                 txn_do($db, sub {
                     if ($buildSteps{$drvPathStep}) {
                         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
                     # failed previously.  This can happen if this is a
@@ -198,7 +205,7 @@ sub doBuild {
                             , type => 0 # = build
                             , drvpath => $drvPathStep
                             , busy => 0
-                            , status => 1
+                            , status => $status
                             , starttime => time
                             , stoptime => time
                             , errormsg => $errorMsg
@@ -208,7 +215,7 @@ sub doBuild {
                 });
 
                 # 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+)$/) {
@@ -254,7 +261,7 @@ sub doBuild {
 
         if ($res != 0) {
             if ($thisBuildFailed && $res == 100 << 8) { $buildStatus = 1; }
-            elsif ($someBuildFailed) { $buildStatus = 2; }
+            elsif (!$thisBuildFailed && $someBuildFailed) { $buildStatus = 2; }
             else { $buildStatus = 3; }
         }
 
diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index 097a421c..4e252130 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -208,7 +208,13 @@ create table BuildSteps (
 
     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,