Don't abort steps that have an unsupported system type
[?]
Aug 17, 2015, 1:10 PM
4CQWOODYIBUEMPSLWTXZPZZTQBYYRGCORKLY4SKG2WVCVXGT654QCDependencies
- [2]
MHVIT4JYSplit hydra-queue-runner.cc more - [3]
IK2UBDAURevive jobset scheduling - [4]
ZK76B5ZZLoad the queue in order of global priority
Change contents
- replacement in src/hydra-queue-runner/queue-monitor.cc at line 164
/* If any step has an unsupported system type or has apreviously failed output path, then fail the build rightaway. *//* If any step has a previously failed output path, then failthe build right away. */ - replacement in src/hydra-queue-runner/queue-monitor.cc at line 167
for (auto & r : newSteps) {BuildStatus buildStatus = bsSuccess;BuildStepStatus buildStepStatus = bssFailed;for (auto & r : newSteps) - edit in src/hydra-queue-runner/queue-monitor.cc at line 170
buildStatus = step == r ? bsFailed : bsDepFailed;buildStepStatus = bssFailed;}if (buildStatus == bsSuccess) {bool supported = false;{auto machines_(machines.lock()); // FIXME: use shared_mutexfor (auto & m : *machines_)if (m.second->supportsStep(r)) { supported = true; break; }}if (!supported) {printMsg(lvlError, format("aborting unsupported build %1%") % build->id);buildStatus = bsUnsupported;buildStepStatus = bssUnsupported;}}if (buildStatus != bsSuccess) {time_t now = time(0); - replacement in src/hydra-queue-runner/queue-monitor.cc at line 172
createBuildStep(txn, 0, build, r, "", buildStepStatus);createBuildStep(txn, 0, build, r, "", bssFailed); - replacement in src/hydra-queue-runner/queue-monitor.cc at line 174
("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $3, isCachedBuild = $4 where id = $1 and finished = 0")("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $3, isCachedBuild = 1 where id = $1 and finished = 0") - replacement in src/hydra-queue-runner/queue-monitor.cc at line 176
((int) buildStatus)(now)(buildStatus != bsUnsupported ? 1 : 0).exec();((int) (step == r ? bsFailed : bsDepFailed))(time(0)).exec(); - edit in src/hydra-queue-runner/queue-monitor.cc at line 185
}