grahamc/hydra2 - Change VA3Z62HQORGCVMKEDRX7CDC3RE7ZCEUOD5F3GVJDIF2SG2TXTJ4QC

Revert "Fix unhelpful error messages in aggregate jobs."

Created by Graham Christensen on October 23, 2021

VA3Z62HQORGCVMKEDRX7CDC3RE7ZCEUOD5F3GVJDIF2SG2TXTJ4QC

Dependencies

In channels

main

Change contents

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 441 [5.530]

B:BD[3.12686] → [4.0:89]

            // For the error message
            std::string lastTriedJobName = i.key();

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 445 [5.530]

B:BD[3.12790] → [4.90:820]

∅:D[6.143] → [3.13376:13377]

∅:D[4.820] → [3.13376:13377]

B:BD[3.13376] → [3.13376:13377]

B:BD[3.13377] → [4.821:1166]

B:BD[4.1166] → [2.0:804]

∅:D[2.804] → [4.1501:1523]

B:BD[4.1501] → [4.1501:1523]

            try {
                if (myArgs.dryRun) {
                    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);
                        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};
                        }
                    }

[3.12790]

[3.13961]

            if (myArgs.dryRun) {
                for (std::string jobName2 : *named) {
                    auto job2 = state->jobs.find(jobName2);
                    if (job2 == state->jobs.end())
                        throw Error("aggregate job '%s' references non-existent job '%s'", jobName, jobName2);
                    std::string drvPath2 = (*job2)["drvPath"];
                    job["constituents"].push_back(drvPath2);
                }
            } else {
                auto drvPath = store->parseStorePath((std::string) job["drvPath"]);
                auto drv = store->readDerivation(drvPath);

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 457 [5.530]

B:BD[3.13962] → [4.1524:2180]

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

[3.13962]

[4.2180]

                for (std::string jobName2 : *named) {
                    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};
                }

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 467 [5.530]

B:BD[4.2181] → [4.2181:2293]

                    debug("rewrote aggregate derivation %s -> %s", store->printStorePath(drvPath), newDrvPath);

[4.2181]

[3.14561]

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

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 476 [5.530]

B:BD[3.14562] → [4.2294:2694]

                    job["drvPath"] = newDrvPath;
                    job["outputs"]["out"] = store->printStorePath(outPath);
                }
            } catch (std::exception & e) {
                // Print more information to help debugging.
                printError("Unexpected error in hydra-eval-jobs when handling job '%s', when producing aggregate job '%s':", lastTriedJobName, jobName);

[3.14562]

[3.14647]

                debug("rewrote aggregate derivation %s -> %s", store->printStorePath(drvPath), newDrvPath);

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 478 [5.530]

B:BD[3.14648] → [4.2695:2771]

                // And throw the original exception!
                throw;

[3.14648]

[3.14765]

                job["drvPath"] = newDrvPath;
                job["outputs"]["out"] = store->printStorePath(outPath);