grahamc/hydra2 - Change 5N7LVAJNE4LN6H7HLPOHTROMDHT3DYJIO6GE4CVSAWZZIDNN66NAC

Keep track of requiredSystemFeatures in the machine stats

For example, steps that require the "kvm" feature may require a different kind of machine to be provisioned. This can also be used to require performance-sensitive tests to run on a particular kind of machine, e.g., by setting requiredSystemFeatures to something like "ec2-i2.8xlarge".

Created by Eelco Dolstra on August 17, 2015

5N7LVAJNE4LN6H7HLPOHTROMDHT3DYJIO6GE4CVSAWZZIDNN66NAC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/dispatcher.cc at line 161 [3.14628]

B:BD[2.390] → [2.390:445]

                runnablePerType[step->drv.platform]++;

[2.390]

[3.18020]

                runnablePerType[step->systemType]++;

Replacement in src/hydra-queue-runner/dispatcher.cc at line 222 [3.14628]

B:BD[4.1899] → [2.446:570]

                    assert(runnablePerType[step->drv.platform]);
                    runnablePerType[step->drv.platform]--;

[4.1899]

[5.4106]

                    assert(runnablePerType[step->systemType]);
                    runnablePerType[step->systemType]--;

Replacement in src/hydra-queue-runner/dispatcher.cc at line 294 [3.14628]

B:BD[2.1305] → [2.1305:1361]

        (*machineTypes_)[step->drv.platform].running++;

[2.1305]

[2.1361]

        (*machineTypes_)[step->systemType].running++;

Replacement in src/hydra-queue-runner/dispatcher.cc at line 308 [3.14628]

B:BD[2.1613] → [2.1613:1680]

        auto & machineType = (*machineTypes_)[step->drv.platform];

[2.1613]

[2.1680]

        auto & machineType = (*machineTypes_)[step->systemType];

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 362 [3.20067]
[3.31444]
[3.31444]
```
    step->systemType = step->drv.platform;
```
Replacement in src/hydra-queue-runner/queue-monitor.cc at line 365 [3.20067]
B:BD[3.31513] → [3.31513:31551]
```
        if (i != step->drv.env.end())
```
[3.31513]
[3.31551]
```
        if (i != step->drv.env.end()) {
```

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 367 [3.20067]

[3.31644]

            step->systemType += ":";
            step->systemType += concatStringsSep(",", step->requiredSystemFeatures);
        }

Insertion in src/hydra-queue-runner/state.hh at line 138 [6.1128]

[6.2488]

    std::string systemType; // concatenation of drv.platform and requiredSystemFeatures