grahamc/hydra2 - Change JOYONH2KARKK2Z72WQW6DZ4B6WT47Z4VHOHGL7KM3B6RT3CBAMLQC

Prevent multiple builds with the same (job, outPath) tuple from being added

This happened in a pathological case in Nixpkgs: the "grub" job is evaluated for i686-linux and x86_64-linux, but in the latter case it returns the same derivation as in the former case. So only one build should be added.

Created by Eelco Dolstra on April 2, 2012

JOYONH2KARKK2Z72WQW6DZ4B6WT47Z4VHOHGL7KM3B6RT3CBAMLQC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Controller/Build.pm at line 535 [4.1]

B:BD[3.1031] → [2.0:66]

        $inputInfo, $nixExprInput, $job, \%currentBuilds, undef);

[3.1031]

[3.1090]

        $inputInfo, $nixExprInput, $job, \%currentBuilds, undef, {});

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 806 [5.2663]

B:BD[3.3507] → [2.395:494]

    my ($db, $project, $jobset, $inputInfo, $nixExprInput, $buildInfo, $buildIds, $prevEval) = @_;

[3.3507]

[3.3600]

    my ($db, $project, $jobset, $inputInfo, $nixExprInput, $buildInfo, $buildIds, $prevEval, $jobOutPathMap) = @_;

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 847 [5.2663]

[3.5175]

[6.402]


        # Prevent multiple builds with the same (job, outPath) from
        # being added.
        my $prev = $$jobOutPathMap{$job->name . "\t" . $outPath};
        if (defined $prev) {
            print STDERR "    already scheduled as build ", $prev, "\n";
            return;
        }

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 897 [5.2663]
[2.1542]
[3.6007]
```
        $$jobOutPathMap{$job->name . "\t" . $outPath} = $build->id;
```
Insertion in src/script/hydra-evaluator at line 126 [9.1319]
[7.5575]
[8.5887]
```
    my $jobOutPathMap = {};
```

Replacement in src/script/hydra-evaluator at line 143 [9.1319]

B:BD[2.2411] → [2.2411:2515]

            checkBuild($db, $project, $jobset, $inputInfo, $nixExprInput, $job, \%buildIds, $prevEval);

[2.2411]

[7.5911]

            checkBuild($db, $project, $jobset, $inputInfo, $nixExprInput, $job, \%buildIds, $prevEval, $jobOutPathMap);