Keep track of requiredSystemFeatures in the machine stats

[?]

Aug 17, 2015, 12:37 PM

5N7LVAJNE4LN6H7HLPOHTROMDHT3DYJIO6GE4CVSAWZZIDNN66NAC

Dependencies

[2] EYR3EW6J Keep stats for the Hydra auto scaler
[3] 4I2HF4L3 Unindent
[4] MHVIT4JY Split hydra-queue-runner.cc more
[5] WE5Q2NVI Allow build to be bumped to the front of the queue via the web interface
[6] IK2UBDAU Revive jobset scheduling
[7] 46ADBTMQ Start steps in order of ascending build ID
[*] HJOEIMLR Refactor

Change contents

replacement in src/hydra-queue-runner/dispatcher.cc at line 161

[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.1899]→[2.446:570](∅→∅)

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

[3.1899]

[3.4106]

assert(runnablePerType[step->systemType]);
runnablePerType[step->systemType]--;
replacement in src/hydra-queue-runner/dispatcher.cc at line 294

[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

[2.1613]→[2.1613:1680](∅→∅)

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

[2.1613]

[2.1680]

auto & machineType = (*machineTypes_)[step->systemType];
edit in src/hydra-queue-runner/queue-monitor.cc at line 362

[3.31444]

[3.31444]

step->systemType = step->drv.platform;
replacement in src/hydra-queue-runner/queue-monitor.cc at line 365

[3.31513]→[3.31513:31551](∅→∅)

if (i != step->drv.env.end())

[3.31513]

[3.31551]

if (i != step->drv.env.end()) {
edit in src/hydra-queue-runner/queue-monitor.cc at line 367

[3.31644]

[3.31644]

step->systemType += ":";
step->systemType += concatStringsSep(",", step->requiredSystemFeatures);
}
edit in src/hydra-queue-runner/state.hh at line 138

[9.2488]

[9.2488]

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