raito/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Merge pull request #1047 from NixOS/revert-825-fix/unhelpful-errors-in-aggregates

Browse source 
Revert "Fix unhelpful error messages in aggregate jobs."
This commit is contained in:
Graham Christensen 2021-10-23 22:23:40 -04:00 committed by GitHub
parent 3516950d3c 8cf158b7a9
commit 7fbf5cbd42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/hydra-eval-jobs/hydra-eval-jobs.cc
View file

@ -438,65 +438,45 @@ int main(int argc, char * * argv)
for (auto i = state->jobs.begin(); i != state->jobs.end(); ++i) { for (auto i = state->jobs.begin(); i != state->jobs.end(); ++i) {
auto jobName = i.key(); auto jobName = i.key();
auto & job = i.value(); auto & job = i.value();
// For the error message
std::string lastTriedJobName = i.key();
auto named = job.find("namedConstituents"); auto named = job.find("namedConstituents");
if (named == job.end()) continue; if (named == job.end()) continue;
try { if (myArgs.dryRun) {
if (myArgs.dryRun) { for (std::string jobName2 : *named) {
for (std::string jobName2 : *named) { auto job2 = state->jobs.find(jobName2);
lastTriedJobName = jobName2; if (job2 == state->jobs.end())
auto job2 = state->jobs.find(jobName2); throw Error("aggregate job '%s' references non-existent job '%s'", jobName, jobName2);
if (job2 == state->jobs.end()) std::string drvPath2 = (*job2)["drvPath"];
throw Error("aggregate job '%s' references non-existent job '%s'", jobName, jobName2); job["constituents"].push_back(drvPath2);
std::string drvPath2 = (*job2)["drvPath"];
job["constituents"].push_back(drvPath2);
}
} else {
auto drvPath = store->parseStorePath((std::string) job["drvPath"]);
auto drv = store->readDerivation(drvPath);
for (std::string jobName2 : *named) {
lastTriedJobName = jobName2;
auto job2 = state->jobs.find(jobName2);
if (job2 == state->jobs.end())
throw Error("aggregate job '%s' references non-existent job '%s'", jobName, jobName2);
if ((*job2).find("error") != (*job2).end()) {
if (job.find("error") == job.end()) {
job["error"] = fmt("Errors aggregating aggregate job '%1%'.\n", jobName);
}
job["error"] = fmt("While handling '%1%': %2%\n", jobName2, (std::string) (*job2)["error"]);
} else {
auto drvPath2 = store->parseStorePath((std::string) (*job2)["drvPath"]);
auto drv2 = store->readDerivation(drvPath2);
job["constituents"].push_back(store->printStorePath(drvPath2));
drv.inputDrvs[drvPath2] = {drv2.outputs.begin()->first};
}
}
std::string drvName(drvPath.name());
assert(hasSuffix(drvName, drvExtension));
drvName.resize(drvName.size() - drvExtension.size());
auto h = std::get<Hash>(hashDerivationModulo(*store, drv, true));
auto outPath = store->makeOutputPath("out", h, drvName);
drv.env["out"] = store->printStorePath(outPath);
drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed { .path = outPath } });
auto newDrvPath = store->printStorePath(writeDerivation(*store, drv));
debug("rewrote aggregate derivation %s -> %s", store->printStorePath(drvPath), newDrvPath);
job["drvPath"] = newDrvPath;
job["outputs"]["out"] = store->printStorePath(outPath);
} }
} catch (std::exception & e) { } else {
// Print more information to help debugging. auto drvPath = store->parseStorePath((std::string) job["drvPath"]);
printError("Unexpected error in hydra-eval-jobs when handling job '%s', when producing aggregate job '%s':", lastTriedJobName, jobName); auto drv = store->readDerivation(drvPath);
// And throw the original exception! for (std::string jobName2 : *named) {
throw; auto job2 = state->jobs.find(jobName2);
if (job2 == state->jobs.end())
throw Error("aggregate job '%s' references non-existent job '%s'", jobName, jobName2);
auto drvPath2 = store->parseStorePath((std::string) (*job2)["drvPath"]);
auto drv2 = store->readDerivation(drvPath2);
job["constituents"].push_back(store->printStorePath(drvPath2));
drv.inputDrvs[drvPath2] = {drv2.outputs.begin()->first};
}
std::string drvName(drvPath.name());
assert(hasSuffix(drvName, drvExtension));
drvName.resize(drvName.size() - drvExtension.size());
auto h = std::get<Hash>(hashDerivationModulo(*store, drv, true));
auto outPath = store->makeOutputPath("out", h, drvName);
drv.env["out"] = store->printStorePath(outPath);
drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed { .path = outPath } });
auto newDrvPath = store->printStorePath(writeDerivation(*store, drv));
debug("rewrote aggregate derivation %s -> %s", store->printStorePath(drvPath), newDrvPath);
job["drvPath"] = newDrvPath;
job["outputs"]["out"] = store->printStorePath(outPath);
} }
job.erase("namedConstituents"); job.erase("namedConstituents");