grahamc/hydra - Change TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC

Remove the `sendDerivation` logic from the builder

The queue runner used to special-case localhost as a remote builder: Rather than using the normal remote-build (using the cmdBuildDerivation command), it was using the (generally less efficient, except when running against localhost) cmdBuildPaths command because the latter didn't require a privileged Nix user (so made testing easier − allowing to run hydra in a container in particular).

However:

this means that the build loop can follow two discint code paths depending on the setup, the irony being that the most commonly used one in production (the “non-localhost” case) isn't the one used in the testsuite (because all the tests run against a local store);
It turns out that the “localhost” version is buggy in relatively obvious ways − in particular a failure in a fixed-output derivation or a hash mismatch isn't reported properly;
If the “run in a container” use-case is indeed that important, it can be (partially) restored using a chroot store (which wouldn't behave excactly the same way of course, but would be more than good-enough for testing)

Created by regnat on February 23, 2021

TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC

Dependencies

In channels

upstream

main

Change contents

Deletion in src/hydra-queue-runner/build-remote.cc at line 213 [5.85]
B:BD[4.328] → [4.328:364]
```
        bool sendDerivation = true;
```

Deletion in src/hydra-queue-runner/build-remote.cc at line 225 [5.85]

∅:D[6.776] → [7.39:352]

B:BD[4.917] → [7.39:352]

∅:D[7.352] → [4.973:1013]

B:BD[4.973] → [4.973:1013]

            // Always send the derivation to localhost, since it's a
            // no-op anyway but we might not be privileged to use
            // cmdBuildDerivation (e.g. if we're running in a NixOS
            // container).
            if (GET_PROTOCOL_MINOR(remoteVersion) >= 1 && !machine->isLocalhost())
                sendDerivation = false;

Replacement in src/hydra-queue-runner/build-remote.cc at line 249 [5.85]
B:BD[8.651] → [4.1703:1731]
B:BD[4.1731] → [6.860:902]
∅:D[9.891] → [4.1773:1786]
∅:D[6.902] → [4.1773:1786]
∅:D[10.1398] → [4.1773:1786]
B:BD[4.1773] → [4.1773:1786]
B:BD[4.1786] → [9.892:942]
B:BD[9.942] → [6.903:937]
```
        if (sendDerivation)
            inputs.insert(step->drvPath);
        else
            for (auto & p : step->drv->inputSrcs)
                inputs.insert(p);
```
[8.651]
[8.797]
```
        for (auto & p : step->drv->inputSrcs)
            inputs.insert(p);
```

Replacement in src/hydra-queue-runner/build-remote.cc at line 306 [5.85]

B:BD[11.355] → [10.2174:2237]

B:BD[10.2237] → [3.0:79]

∅:D[3.79] → [10.2309:2475]

∅:D[12.232] → [10.2309:2475]

∅:D[6.1108] → [10.2309:2475]

B:BD[10.2309] → [10.2309:2475]

        if (sendDerivation) {
            to << cmdBuildPaths;
            worker_proto::write(*localStore, to, StorePathSet{step->drvPath});
        } else {
            to << cmdBuildDerivation << localStore->printStorePath(step->drvPath);
            writeDerivation(to, *localStore, basicDrv);
        }

[11.355]

[4.3615]

        to << cmdBuildDerivation << localStore->printStorePath(step->drvPath);
        writeDerivation(to, *localStore, basicDrv);

Replacement in src/hydra-queue-runner/build-remote.cc at line 325 [5.85]

B:BD[8.1154] → [4.3975:4028]

B:BD[4.4028] → [6.1109:1202]

∅:D[6.1202] → [4.4136:4551]

B:BD[4.4136] → [4.4136:4551]

∅:D[4.4551] → [13.116:130]

B:BD[13.116] → [13.116:130]

B:BD[13.130] → [4.4552:4660]

B:BD[4.4660] → [14.259:427]

B:BD[14.427] → [2.0:360]

∅:D[2.360] → [14.427:441]

B:BD[14.427] → [14.427:441]

∅:D[14.441] → [4.4660:5695]

B:BD[4.4660] → [4.4660:5695]

B:BD[4.5945] → [4.5945:6391]

B:BD[4.6391] → [15.428:656]

∅:D[15.656] → [4.6391:6521]

B:BD[4.6391] → [4.6391:6521]

        if (sendDerivation) {
            if (res) {
                result.errorMsg = fmt("%s on ‘%s’", readString(from), machine->sshName);
                if (res == 100) {
                    result.stepStatus = bsFailed;
                    result.canCache = true;
                }
                else if (res == 101) {
                    result.stepStatus = bsTimedOut;
                }
                else {
                    result.stepStatus = bsAborted;
                    result.canRetry = true;
                }
                return;
            }
            result.stepStatus = bsSuccess;
        } else {
            result.errorMsg = readString(from);
            if (GET_PROTOCOL_MINOR(remoteVersion) >= 3) {
                result.timesBuilt = readInt(from);
                result.isNonDeterministic = readInt(from);
                auto start = readInt(from);
                auto stop = readInt(from);
                if (start && start) {
                    /* Note: this represents the duration of a single
                       round, rather than all rounds. */
                    result.startTime = start;
                    result.stopTime = stop;
                }
            }
            switch ((BuildResult::Status) res) {
                case BuildResult::Built:
                    result.stepStatus = bsSuccess;
                    break;
                case BuildResult::Substituted:
                case BuildResult::AlreadyValid:
                    result.stepStatus = bsSuccess;
                    result.isCached = true;
                    break;
                case BuildResult::PermanentFailure:
                    result.stepStatus = bsFailed;
                    result.canCache = true;
                    result.errorMsg = "";
                    break;
                case BuildResult::InputRejected:
                case BuildResult::OutputRejected:
                    result.stepStatus = bsFailed;
                    result.canCache = true;
                    break;
                case BuildResult::TransientFailure:
                    result.stepStatus = bsFailed;
                    result.canRetry = true;
                    result.errorMsg = "";
                    break;
                case BuildResult::TimedOut:
                    result.stepStatus = bsTimedOut;
                    result.errorMsg = "";
                    break;
                case BuildResult::MiscFailure:
                    result.stepStatus = bsAborted;
                    result.canRetry = true;
                    break;
                case BuildResult::LogLimitExceeded:
                    result.stepStatus = bsLogLimitExceeded;
                    break;
                case BuildResult::NotDeterministic:
                    result.stepStatus = bsNotDeterministic;
                    result.canRetry = false;
                    result.canCache = true;
                    break;
                default:
                    result.stepStatus = bsAborted;
                    break;

[8.1154]

[13.333]

        result.errorMsg = readString(from);
        if (GET_PROTOCOL_MINOR(remoteVersion) >= 3) {
            result.timesBuilt = readInt(from);
            result.isNonDeterministic = readInt(from);
            auto start = readInt(from);
            auto stop = readInt(from);
            if (start && start) {
                /* Note: this represents the duration of a single
                    round, rather than all rounds. */
                result.startTime = start;
                result.stopTime = stop;

Replacement in src/hydra-queue-runner/build-remote.cc at line 337 [5.85]

B:BD[13.347] → [4.6522:6578]

            if (result.stepStatus != bsSuccess) return;

[13.347]

[8.1529]

        }
        switch ((BuildResult::Status) res) {
            case BuildResult::Built:
                result.stepStatus = bsSuccess;
                break;
            case BuildResult::Substituted:
            case BuildResult::AlreadyValid:
                result.stepStatus = bsSuccess;
                result.isCached = true;
                break;
            case BuildResult::PermanentFailure:
                result.stepStatus = bsFailed;
                result.canCache = true;
                result.errorMsg = "";
                break;
            case BuildResult::InputRejected:
            case BuildResult::OutputRejected:
                result.stepStatus = bsFailed;
                result.canCache = true;
                break;
            case BuildResult::TransientFailure:
                result.stepStatus = bsFailed;
                result.canRetry = true;
                result.errorMsg = "";
                break;
            case BuildResult::TimedOut:
                result.stepStatus = bsTimedOut;
                result.errorMsg = "";
                break;
            case BuildResult::MiscFailure:
                result.stepStatus = bsAborted;
                result.canRetry = true;
                break;
            case BuildResult::LogLimitExceeded:
                result.stepStatus = bsLogLimitExceeded;
                break;
            case BuildResult::NotDeterministic:
                result.stepStatus = bsNotDeterministic;
                result.canRetry = false;
                result.canCache = true;
                break;
            default:
                result.stepStatus = bsAborted;
                break;

Insertion in src/hydra-queue-runner/build-remote.cc at line 382 [5.85]
[8.1539]
[4.6579]
```
        if (result.stepStatus != bsSuccess) return;
```