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

Move GC roots to /nix/var/nix/gcroots/hydra

Browse Source 
The uid split a while back caused the web interface to create GC roots
in /nix/var/nix/gcroots/per-user/hydra-www, where they wouldn't be
purged by hydra-update-gc-roots. Thus restarted builds would
accumulate forever. The fix is to keep the roots in a shared directory
with gid=hydra.
This commit is contained in:
Eelco Dolstra
2015-12-14 13:31:24 +01:00
parent e04fb5c8e7
commit b081133dcc
2 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/Hydra/Helper/Nix.pm
View File

@ -32,11 +32,18 @@ sub getHydraHome {
}
my $hydraConfig;
sub getHydraConfig {
return $hydraConfig if defined $hydraConfig;
my $conf = $ENV{"HYDRA_CONFIG"} || (Hydra::Model::DB::getHydraPath . "/hydra.conf");
return {} unless -f $conf;
my %config = new Config::General($conf)->getall;
return \%config;
if (-f $conf) {
my %h = new Config::General($conf)->getall;
$hydraConfig = \%h;
} else {
$hydraConfig = {};
}
return $hydraConfig;
}
@ -68,8 +75,12 @@ sub getSCMCacheDir {
sub getGCRootsDir {
die unless defined $ENV{LOGNAME};
my $dir = ($ENV{NIX_STATE_DIR} || "/nix/var/nix" ) . "/gcroots/per-user/$ENV{LOGNAME}/hydra-roots";
my $config = getHydraConfig();
my $dir = $config->{gc_roots_dir};
unless (defined $dir) {
die unless defined $ENV{LOGNAME};
$dir = ($ENV{NIX_STATE_DIR} || "/nix/var/nix" ) . "/gcroots/per-user/$ENV{LOGNAME}/hydra-roots";
}
mkpath $dir if !-e $dir;
return $dir;
}