Merge pull request #1178 from DeterminateSystems/hydra-update-gc-roots/network-traffic

hydra-update-gc-roots: allow cached refs to the build's jobset

src/script/hydra-update-gc-roots

@@ -37,12 +37,7 @@ sub keepBuild {
     return if defined $seenBuilds{$build->id};
     $seenBuilds{$build->id} = 1;
 
-    $build->finished;
+    my ($jobset) = $build->jobset;
-
-    # After #1093 merges this can become $build->jobset;
-    # However, with ->jobset being a column on master
-    # it seems DBIX gets a bit confused.
-    my ($jobset) = $build->search_related('jobset')->first;
 
     print STDERR "  keeping ", ($build->finished ? "" : "scheduled "), "build ", $build->id, " (",
         $jobset->get_column('project'), ":", $jobset->get_column('name'), ":", $build->get_column('job'), "; ",
@@ -79,13 +74,29 @@ closedir $dir;
 
 # For scheduled builds, we register the derivation as a GC root.
 print STDERR "*** looking for scheduled builds\n";
-keepBuild($_, 0) foreach $db->resultset('Builds')->search({ finished => 0 }, { columns => [ @columns ] });
+keepBuild($_, 0) foreach $db->resultset('Builds')->search(
+    { finished => 0 },
+    {
+        columns => [ @columns ],
+        join      => 'jobset',
+        '+select' => ['jobset.project', 'jobset.name'],
+        '+as'     => ['jobset.project', 'jobset.name'],
+    }
+);
 
 
 # Keep all builds that have been marked as "keep".
 print STDERR "*** looking for kept builds\n";
 my @buildsToKeep = $db->resultset('Builds')->search(
-    { finished => 1, keep => 1 }, { order_by => ["jobset_id", "job", "id"], columns => [ @columns ] });
+    { finished => 1, keep => 1 },
+    {
+        order_by => ["jobset_id", "job", "id"],
+        columns => [ @columns ],
+        join      => 'jobset',
+        '+select' => ['jobset.project', 'jobset.name'],
+        '+as'     => ['jobset.project', 'jobset.name'],
+    }
+);
 keepBuild($_, 0) foreach @buildsToKeep;
 
 
@@ -124,10 +135,17 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
         # Note: we also keep the derivations of failed builds so that
         # they can be restarted.
         keepBuild($_, 1) foreach $jobset->builds->search(
-            { id => { -in => $db->resultset('JobsetEvalMembers')->search({ eval => { -in => [@evals] } }, { select => "build" })->as_query }
+            { "me.id" => { -in => $db->resultset('JobsetEvalMembers')->search({ eval => { -in => [@evals] } }, { select => "build" })->as_query }
             , finished => 1
             },
-            { order_by => ["job", "id"], columns => [ @columns ] });
+            {
+                order_by => ["job", "me.id"],
+                columns => [ @columns ],
+                join      => 'jobset',
+                '+select' => ['jobset.project', 'jobset.name'],
+                '+as'     => ['jobset.project', 'jobset.name'],
+            }
+        );
 
         print STDERR "*** looking for the most recent successful builds of current jobs in ",
             $project->name, ":", $jobset->name, "\n";
@@ -135,7 +153,7 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
         # Keep the most recently succeeded build of a current job. Oh
         # I really need to stop using DBIx::Class.
         keepBuild($_, 1) foreach $jobset->builds->search(
-            { id => { -in => $jobset->builds->search(
+            { "me.id" => { -in => $jobset->builds->search(
                 { finished => 1
                 , buildstatus => [0, 6]
                 , job => { -in => $jobset->builds->search(
@@ -144,10 +162,16 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
                                )->as_query }
                 },
                 { group_by => 'job'
-                , select => [ { max => 'id', -as => 'm' } ]
+                , select => [ { max => 'me.id', -as => 'm' } ]
                 })->as_query }
             },
-            { columns => [ @columns ] });
+            {
+                columns => [ @columns ],
+                join      => 'jobset',
+                '+select' => ['jobset.project', 'jobset.name'],
+                '+as'     => ['jobset.project', 'jobset.name'],
+            }
+        );
     }
 }
 

t/scripts/hydra-update-gc-roots/update-gc-roots.t

@@ -16,7 +16,7 @@ subtest "Updating GC roots" => sub {
     is($res, 0, "hydra-update-gc-roots should exit zero");
     if ($res != 0) {
         print "gc roots stdout: $stdout\n";
-        print "gc roots stderr: $stderr";
+        print "gc roots stderr: $stderr\n";
     }
 };