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

update-gc-roots: try subselecting the jobset table

Browse source
This commit is contained in:
Graham Christensen 2022-03-19 23:12:28 -04:00
parent 145667cb53
commit f353a7ac41
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/script/hydra-update-gc-roots
View file

@ -37,8 +37,6 @@ sub keepBuild {
return if defined $seenBuilds{$build->id}; return if defined $seenBuilds{$build->id};
$seenBuilds{$build->id} = 1; $seenBuilds{$build->id} = 1;
$build->finished;
my ($jobset) = $build->jobset; my ($jobset) = $build->jobset;
print STDERR " keeping ", ($build->finished ? "" : "scheduled "), "build ", $build->id, " (", print STDERR " keeping ", ($build->finished ? "" : "scheduled "), "build ", $build->id, " (",
@ -76,13 +74,29 @@ closedir $dir;
# For scheduled builds, we register the derivation as a GC root. # For scheduled builds, we register the derivation as a GC root.
print STDERR "*** looking for scheduled builds\n"; 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". # Keep all builds that have been marked as "keep".
print STDERR "*** looking for kept builds\n"; print STDERR "*** looking for kept builds\n";
my @buildsToKeep = $db->resultset('Builds')->search( 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; keepBuild($_, 0) foreach @buildsToKeep;