Revert "Add a dependency_lookup configuration option to enable (slow) dependency lookup in queue. This behaviour was disabled temporarily in accefbb79 due to slowness in very large queues, but some people might be dependent on it, so it is configurable until the previous behaviour is implemented more efficiently."

This reverts commit 24f5a6b15f.
This commit is contained in:
Eelco Dolstra 2013-10-03 13:07:32 +02:00
parent 9f3b47c963
commit b1a26e6caa

View file

@ -19,7 +19,6 @@ my $lastTime;
#$SIG{CHLD} = 'IGNORE'; #$SIG{CHLD} = 'IGNORE';
my $config = getHydraConfig();
sub unlockDeadBuilds { sub unlockDeadBuilds {
# Unlock builds whose building process has died. # Unlock builds whose building process has died.
@ -49,7 +48,7 @@ sub unlockDeadBuilds {
# depends; or undef if no such build exists. # depends; or undef if no such build exists.
sub findBuildDependencyInQueue { sub findBuildDependencyInQueue {
my ($buildsByDrv, $build) = @_; my ($buildsByDrv, $build) = @_;
return undef if !($config->{dependency_lookup} // 0); # FIXME return undef; # FIXME
return undef unless isValidPath($build->drvpath); return undef unless isValidPath($build->drvpath);
my @deps = grep { /\.drv$/ && $_ ne $build->drvpath } computeFSClosure(0, 0, $build->drvpath); my @deps = grep { /\.drv$/ && $_ ne $build->drvpath } computeFSClosure(0, 0, $build->drvpath);
return unless scalar @deps > 0; return unless scalar @deps > 0;