grahamc/hydra - Change NAYQT2GTCJPBFRSK7CBFX655F2NGTBPICJSCYG2CSCQ5NRDHZG6QC

hydra-queue-runner: Use cmdBuildDerivation

See https://github.com/NixOS/nix/commit/1511aa9f488ba0762c2da0bf8ab61b5fde47305d and https://github.com/NixOS/nix/commit/eda2f36c2ac847e02e871c327e7633693d92cd8d.

Created by Eelco Dolstra on July 20, 2015

NAYQT2GTCJPBFRSK7CBFX655F2NGTBPICJSCYG2CSCQ5NRDHZG6QC

Dependencies

In channels

upstream

main

Change contents

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

B:BD[4.1844] → [4.1844:1954]

B:BD[4.1954] → [5.0:31]

    writeInt(cmdQueryValidPaths, to);
    writeInt(1, to); // == lock paths
    writeInt(useSubstitutes, to);
    writeStrings(closure, to);

[4.1844]

[4.1984]

    to << cmdQueryValidPaths << 1 << useSubstitutes << closure;

Replacement in src/hydra-queue-runner/build-remote.cc at line 104 [4.85]
B:BD[5.286] → [5.286:320]
```
    writeInt(cmdImportPaths, to);
```
[5.286]
[5.320]
```
    to << cmdImportPaths;
```

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

B:BD[4.2563] → [4.2563:2664]

    writeInt(cmdExportPaths, to);
    writeInt(0, to); // == don't sign
    writeStrings(paths, to);

[4.2563]

[4.2664]

    to << cmdExportPaths << 0 << paths;

Insertion in src/hydra-queue-runner/build-remote.cc at line 148 [4.85]
[4.3414]
[6.79]
```
    bool sendDerivation = true;
```

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

B:BD[6.89] → [6.89:172]

        writeInt(SERVE_MAGIC_1, to);
        writeInt(SERVE_PROTOCOL_VERSION, to);

[6.89]

[6.172]

        to << SERVE_MAGIC_1 << SERVE_PROTOCOL_VERSION;

Insertion in src/hydra-queue-runner/build-remote.cc at line 159 [4.85]

[3.655]

[6.587]

        if (GET_PROTOCOL_MINOR(version) >= 1)
            sendDerivation = false;

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

B:BD[7.7] → [7.7:36]

B:BD[7.36] → [3.745:782]

    /* Gather the inputs. */
    PathSet inputs({step->drvPath});

[7.7]

[3.782]

    /* Gather the inputs. If the remote side is Nix <= 1.9, we have to
       copy the entire closure of ‘drvPath’, as well the required
       outputs of the input derivations. On Nix > 1.9, we only need to
       copy the immediate sources of the derivation and the required
       outputs of the input derivations. */
    PathSet inputs;
    if (sendDerivation)
        inputs.insert(step->drvPath);
    else
        for (auto & p : step->drv.inputSrcs)
            inputs.insert(p);

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

B:BD[7.252] → [7.252:324]

            if (i != drv2.outputs.end()) inputs.insert(i->second.path);

[7.252]

[7.324]

            if (i == drv2.outputs.end()) continue;
            inputs.insert(i->second.path);

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

∅:D[6.941] → [4.4176:4209]

∅:D[3.1092] → [4.4176:4209]

B:BD[4.4176] → [4.4176:4209]

B:BD[4.4209] → [3.1093:1141]

∅:D[3.1141] → [8.113:209]

B:BD[4.4251] → [8.113:209]

    writeInt(cmdBuildPaths, to);
    writeStrings(PathSet({step->drvPath}), to);
    writeInt(maxSilentTime, to);
    writeInt(buildTimeout, to);
    // FIXME: send maxLogSize.

[3.1092]

[4.4352]


    if (sendDerivation)
        to << cmdBuildPaths << PathSet({step->drvPath}) << maxSilentTime << buildTimeout;
    else
        to << cmdBuildDerivation << step->drvPath << step->drv << maxSilentTime << buildTimeout;
        // FIXME: send maxLogSize.

Insertion in src/hydra-queue-runner/build-remote.cc at line 210 [4.85]
[4.4368]
[4.4368]

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

B:BD[4.4460] → [4.4460:4475]

B:BD[4.4475] → [3.1142:1242]

∅:D[3.1242] → [4.4566:4785]

B:BD[4.4566] → [4.4566:4785]

    if (res) {
        result.errorMsg = (format("%1% on ‘%2%’") % readString(from) % machine->sshName).str();
        if (res == 100) result.status = RemoteResult::rrPermanentFailure;
        else if (res == 101) result.status = RemoteResult::rrTimedOut;
        else result.status = RemoteResult::rrMiscFailure;
        return;

[4.4460]

[4.4785]


    if (sendDerivation) {
        if (res) {
            result.errorMsg = (format("%1% on ‘%2%’") % readString(from) % machine->sshName).str();
            if (res == 100) result.status = BuildResult::PermanentFailure;
            else if (res == 101) result.status = BuildResult::TimedOut;
            else result.status = BuildResult::MiscFailure;
            return;
        }
        result.status = BuildResult::Built;
    } else {
        result.status = (BuildResult::Status) res;
        result.errorMsg = readString(from);
        if (!result.success()) return;

Insertion in src/hydra-queue-runner/build-remote.cc at line 234 [4.85]

[4.4792]

    /* If the path was substituted or already valid, then we didn't
       get a build log. */
    if (result.status == BuildResult::Substituted || result.status == BuildResult::AlreadyValid) {
        unlink(result.logFile.c_str());
        result.logFile = "";
    }

Deletion in src/hydra-queue-runner/build-remote.cc at line 255 [4.85]
B:BD[4.5160] → [4.5160:5205]
```
    result.status = RemoteResult::rrSuccess;
```

Replacement in src/hydra-queue-runner/build-result.cc at line 10 [9.441]

B:BD[9.555] → [10.0:84]

BuildResult getBuildResult(std::shared_ptr<StoreAPI> store, const Derivation & drv)

[9.555]

[9.606]

BuildOutput getBuildOutput(std::shared_ptr<StoreAPI> store, const Derivation & drv)

Replacement in src/hydra-queue-runner/build-result.cc at line 12 [9.441]
B:BD[9.608] → [9.608:629]
```
    BuildResult res;
```
[9.608]
[9.629]
```
    BuildOutput res;
```
Replacement in src/hydra-queue-runner/build-result.hh at line 18 [9.4329]
B:BD[9.4597] → [9.4597:4616]
```
struct BuildResult
```
[9.4597]
[9.4616]
```
struct BuildOutput
```

Replacement in src/hydra-queue-runner/build-result.hh at line 32 [9.4329]

B:BD[9.4741] → [10.105:200]

BuildResult getBuildResult(std::shared_ptr<nix::StoreAPI> store, const nix::Derivation & drv);

[9.4741]

BuildOutput getBuildOutput(std::shared_ptr<nix::StoreAPI> store, const nix::Derivation & drv);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 317 [9.4840]

B:BD[9.11162] → [10.2006:2064]

            BuildResult res = getBuildResult(store, drv);

[9.11162]

[4.9877]

            BuildOutput res = getBuildOutput(store, drv);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 825 [9.4840]
B:BD[4.13268] → [11.99:120]
```
    BuildResult res;
```
[4.13268]
[11.120]
```
    BuildOutput res;
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 835 [9.4840]

B:BD[11.511] → [11.511:569]

        result.status = RemoteResult::rrPermanentFailure;

[11.511]

[11.569]

        result.status = BuildResult::CachedFailure;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 852 [9.4840]

B:BD[11.1138] → [11.1138:1195]

            result.status = RemoteResult::rrMiscFailure;

[11.1138]

[11.1195]

            result.status = BuildResult::MiscFailure;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 856 [9.4840]

B:BD[9.16007] → [11.1330:1424]

        if (result.status == RemoteResult::rrSuccess) res = getBuildResult(store, step->drv);

[9.16007]

[11.1469]

        if (result.success()) res = getBuildOutput(store, step->drv);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 873 [9.4840]

∅:D[12.107] → [6.4407:4463]

B:BD[6.4407] → [6.4407:4463]

B:BD[6.4463] → [2.0:92]

    if (result.status == RemoteResult::rrMiscFailure) {
        printMsg(lvlError, format("irregular failure building ‘%1%’ on ‘%2%’: %3%")

[12.107]

[2.92]

    if (result.canRetry()) {
        printMsg(lvlError, format("possibly transient failure building ‘%1%’ on ‘%2%’: %3%")

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 891 [9.4840]
B:BD[6.4555] → [13.3017:3069]
```
    if (result.status == RemoteResult::rrSuccess) {
```
[6.4555]
[13.3069]
```
    if (result.success()) {
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 935 [9.4840]

B:BD[13.4737] → [13.4737:4801]

                    markSucceededBuild(txn, b, res, build != b,

[13.4737]

[13.4801]

                    markSucceededBuild(txn, b, res, build != b || result.status != BuildResult::Built,

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1018 [9.4840]

B:BD[13.6913] → [13.6913:7104]

                    result.status == RemoteResult::rrPermanentFailure ? bsFailed :
                    result.status == RemoteResult::rrTimedOut ? bsTimedOut :
                    bsAborted;

[13.6913]

[13.7104]

                    result.status == BuildResult::TimedOut ? bsTimedOut :
                    result.canRetry() ? bsAborted :
                    bsFailed;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1022 [9.4840]

B:BD[13.7154] → [13.7154:7348]

                    result.status == RemoteResult::rrPermanentFailure ? bssFailed :
                    result.status == RemoteResult::rrTimedOut ? bssTimedOut :
                    bssAborted;

[13.7154]

[13.7348]

                    result.status == BuildResult::TimedOut ? bssTimedOut :
                    result.canRetry() ? bssAborted :
                    bssFailed;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1026 [9.4840]

B:BD[13.7349] → [13.7349:7420]

                /* For regular failures, we don't care about the error

[13.7349]

[13.7420]

                /* For standard failures, we don't care about the error

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1028 [9.4840]

B:BD[13.7451] → [13.7451:7519]

                if (buildStatus != bsAborted) result.errorMsg = "";

[13.7451]

[13.7519]

                if (result.status == BuildResult::PermanentFailure ||
                    result.status == BuildResult::TransientFailure ||
                    result.status == BuildResult::CachedFailure ||
                    result.status == BuildResult::TimedOut)
                    result.errorMsg = "";

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1068 [9.4840]

B:BD[13.9334] → [13.9334:9423]

                if (!cachedFailure && result.status == RemoteResult::rrPermanentFailure)

[13.9334]

[13.9423]

                if (!cachedFailure && result.status == BuildResult::PermanentFailure)

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1110 [9.4840]

B:BD[9.17740] → [9.17740:17824]

    const BuildResult & res, bool isCachedBuild, time_t startTime, time_t stopTime)

[9.17740]

[9.17824]

    const BuildOutput & res, bool isCachedBuild, time_t startTime, time_t stopTime)

Replacement in src/hydra-queue-runner/state.hh at line 46 [14.1128]
B:BD[14.1921] → [3.1553:1573]
```
struct RemoteResult
```
[14.1921]
[3.1573]
```
struct RemoteResult : nix::BuildResult
```

Deletion in src/hydra-queue-runner/state.hh at line 48 [14.1128]

B:BD[3.1575] → [3.1575:1747]

    enum {
        rrSuccess = 0,
        rrPermanentFailure = 1,
        rrTimedOut = 2,
        rrMiscFailure = 3
    } status = rrMiscFailure;
    std::string errorMsg;

Insertion in src/hydra-queue-runner/state.hh at line 50 [14.1128]

[3.1810]


    bool canRetry()
    {
        return status == TransientFailure || status == MiscFailure;
    }

Replacement in src/hydra-queue-runner/state.hh at line 59 [14.1128]
B:BD[14.1934] → [14.1934:1954]
```
struct BuildResult;
```
[14.1934]
[14.1954]
```
struct BuildOutput;
```

Replacement in src/hydra-queue-runner/state.hh at line 284 [14.1128]

B:BD[14.8543] → [14.8543:8632]

        const BuildResult & res, bool isCachedBuild, time_t startTime, time_t stopTime);

[14.8543]

[14.8632]

        const BuildOutput & res, bool isCachedBuild, time_t startTime, time_t stopTime);