grahamc/hydra2 - Change KTH67GR42MDWAAW34EYC6BPHSO33HHWZCMB3QSXRPH2LNZM45EHQC

hydra-eval-jobs: Transmit original Nix error when handling aggregate jobs

It might happen that a job from the aggregate returned an error!

This is what the vague "[json.exception.type_error.302] type must be string, but is null" was all about in this instance; there was no drvPath to stringify!

So we now actively watch for errors and copy them to the aggregate job.

Created by Samuel Dionne-Riel on October 25, 2020

KTH67GR42MDWAAW34EYC6BPHSO33HHWZCMB3QSXRPH2LNZM45EHQC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 470 [3.530]

B:BD[2.1166] → [2.1166:1501]

                        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};

[2.1166]

[2.1501]


                        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};
                        }