grahamc/hydra2 - Change SA5ZZ3I4SPTEEPJ5YE6JJA2DUPD4UTTC3APBNQL6XZW6PXYJRP6QC

hydra-queue-runner: Use nix.machines instead of the SystemTypes table to determine how many build jobs are allowed per system type.

Note that on machines that support multiple system types, EACH system type gets the full number of build slots, which is almost certainly not what we want.

Created by Shea Levy on March 4, 2013

SA5ZZ3I4SPTEEPJ5YE6JJA2DUPD4UTTC3APBNQL6XZW6PXYJRP6QC

Dependencies

In channels

main

Change contents

Insertion in src/script/hydra-queue-runner at line 75 [4.7823]
[3.539]
[4.8469]
```
    my $machines = getMachines;
```

Insertion in src/script/hydra-queue-runner at line 78 [4.7823]

[4.8470]

[2.1238]

    my %maxConcurrent = ();
    foreach my $machineName (keys %{$machines}) {
        foreach my $system (${$machines}{$machineName}{'systemTypes'}) {
            $maxConcurrent{$system} = (${$machines}{$machineName}{'maxJobs'} or 0) + ($maxConcurrent{$system} or 0)
        }
    }

Replacement in src/script/hydra-queue-runner at line 102 [4.7823]

B:BD[4.8666] → [5.756:806]

B:BD[5.806] → [6.5103:5206]

∅:D[6.5206] → [7.2628:2781]

B:BD[7.2628] → [7.2628:2781]

            # How many extra builds can we start?
            (my $systemTypeInfo) = $db->resultset('SystemTypes')->search({system => $system->system});
            my $maxConcurrent = defined $systemTypeInfo ? $systemTypeInfo->maxconcurrent : 2;
            my $extraAllowed = $maxConcurrent - $nrActive;

[4.8666]

[5.892]

            my $extraAllowed = $maxConcurrent{$system} - $nrActive;

Replacement in src/script/hydra-queue-runner at line 112 [4.7823]

B:BD[5.1345] → [7.2782:2847]

                "': $nrActive active, $maxConcurrent allowed, ",

[5.1345]

[3.626]

                "': $nrActive active, $maxConcurrent{$system} allowed, ",