grahamc/hydra2 - Change N4IROACVZ4MU73J5SM6WXJMKQSFR3VN5SOKENNNZNEGMTGB2Q3HAC

Move buildRemote() into State

Created by Eelco Dolstra on July 7, 2015

N4IROACVZ4MU73J5SM6WXJMKQSFR3VN5SOKENNNZNEGMTGB2Q3HAC

Dependencies

In channels

main

Change contents

File deletion: build-remote.hh

BF:BFD[3.187] → [4.5784:5823]

BF:BFD[4.5823] → [4.5249:5249]

B:BD[4.5249] → [4.5250:5314]

∅:D[5.176] → [4.5314:5549]

∅:D[6.754] → [4.5314:5549]

B:BD[4.5314] → [4.5314:5549]

∅:D[7.536] → [4.5549:5729]

B:BD[4.5549] → [4.5549:5729]

B:BD[4.5729] → [8.210:295]

B:BD[8.295] → [9.394:459]

B:BD[9.459] → [10.999:1139]

B:BD[4.5549] → [7.513:536]

B:BD[4.5314] → [5.153:176]

B:BD[5.176] → [6.727:754]

#pragma once
#include "store-api.hh"
#include "derivations.hh"
struct RemoteResult
{
    enum {
        rrSuccess = 0,
        rrPermanentFailure = 1,
        rrTimedOut = 2,
        rrMiscFailure = 3
    } status = rrMiscFailure;
    std::string errorMsg;
    time_t startTime = 0, stopTime = 0;
};
void buildRemote(std::shared_ptr<nix::StoreAPI> store,
    const std::string & sshName, const std::string & sshKey,
    const nix::Path & drvPath, const nix::Derivation & drv,
    const nix::Path & logDir, unsigned int maxSilentTime, unsigned int buildTimeout,
    TokenServer & copyClosureTokenServer, RemoteResult & result,
    counter & nrStepsBuilding, counter & nrStepsCopyingTo, counter & nrStepsCopyingFrom,
    counter & bytesSent, counter & bytesReceived);
    nix::Path logFile;
#include "counter.hh"
#include "token-server.hh"

Replacement in src/hydra-queue-runner/Makefile.am at line 4 [3.219]

B:BD[11.85] → [2.0:91]

 build-remote.hh build-result.hh counter.hh pool.hh sync.hh token-server.hh state.hh db.hh

[11.85]

[3.322]

 build-result.hh counter.hh pool.hh sync.hh token-server.hh state.hh db.hh

Deletion in src/hydra-queue-runner/build-remote.cc at line 6 [4.85]
B:BD[4.172] → [4.172:200]
```
#include "build-remote.hh"
```
Deletion in src/hydra-queue-runner/build-remote.cc at line 7 [4.85]
B:BD[4.201] → [4.201:220]
```
#include "util.hh"
```
Insertion in src/hydra-queue-runner/build-remote.cc at line 9 [4.85]
[4.268]
[4.268]
```
#include "state.hh"
#include "util.hh"
```

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

B:BD[4.2721] → [4.2721:2872]

B:BD[4.2872] → [8.0:85]

B:BD[8.85] → [9.0:65]

B:BD[9.65] → [10.319:458]

void buildRemote(std::shared_ptr<StoreAPI> store,
    const string & sshName, const string & sshKey,
    const Path & drvPath, const Derivation & drv,
    const nix::Path & logDir, unsigned int maxSilentTime, unsigned int buildTimeout,
    TokenServer & copyClosureTokenServer, RemoteResult & result,
    counter & nrStepsBuilding, counter & nrStepsCopyingTo, counter & nrStepsCopyingFrom,
    counter & bytesSent, counter & bytesReceived)

[4.2721]

[4.2925]

void State::buildRemote(std::shared_ptr<StoreAPI> store,
    Machine::ptr machine, Step::ptr step,
    unsigned int maxSilentTime, unsigned int buildTimeout,
    RemoteResult & result)

Replacement in src/hydra-queue-runner/build-remote.cc at line 148 [4.85]
B:BD[4.2927] → [4.2927:2966]
```
    string base = baseNameOf(drvPath);
```
[4.2927]
[7.0]
```
    string base = baseNameOf(step->drvPath);
```

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

B:BD[4.3264] → [4.3264:3315]

    openConnection(sshName, sshKey, logFD, child);

[4.3264]

[4.3315]

    openConnection(machine->sshName, machine->sshKey, logFD, child);

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

B:BD[12.273] → [12.273:379]

            throw Error(format("protocol mismatch with ‘nix-store --serve’ on ‘%1%’") % sshName);

[12.273]

[12.379]

            throw Error(format("protocol mismatch with ‘nix-store --serve’ on ‘%1%’") % machine->sshName);

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

B:BD[12.475] → [12.475:587]

            throw Error(format("unsupported ‘nix-store --serve’ protocol version on ‘%1%’") % sshName);

[12.475]

[12.587]

            throw Error(format("unsupported ‘nix-store --serve’ protocol version on ‘%1%’") % machine->sshName);

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

B:BD[7.406] → [7.406:485]

        throw Error(format("cannot connect to ‘%1%’: %2%") % sshName % s);

[7.406]

[13.0]

        throw Error(format("cannot connect to ‘%1%’: %2%") % machine->sshName % s);

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

B:BD[13.36] → [13.36:108]

    PathSet inputs({drvPath});
    for (auto & input : drv.inputDrvs) {

[13.36]

[13.108]

    PathSet inputs({step->drvPath});
    for (auto & input : step->drv.inputDrvs) {

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

B:BD[4.3911] → [10.459:594]

    if (sshName != "localhost") {
        printMsg(lvlDebug, format("sending closure of ‘%1%’ to ‘%2%’") % drvPath % sshName);

[4.3911]

[9.161]

    if (machine->sshName != "localhost") {
        printMsg(lvlDebug, format("sending closure of ‘%1%’ to ‘%2%’") % step->drvPath % machine->sshName);

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

B:BD[4.4089] → [12.854:941]

    printMsg(lvlDebug, format("building ‘%1%’ on ‘%2%’") % drvPath % sshName);

[4.4089]

[4.4176]

    printMsg(lvlDebug, format("building ‘%1%’ on ‘%2%’") % step->drvPath % machine->sshName);

Replacement in src/hydra-queue-runner/build-remote.cc at line 205 [4.85]
B:BD[4.4209] → [4.4209:4251]
```
    writeStrings(PathSet({drvPath}), to);
```
[4.4209]
[8.113]
```
    writeStrings(PathSet({step->drvPath}), to);
```

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

B:BD[4.4475] → [4.4475:4566]

        result.errorMsg = (format("%1% on ‘%2%’") % readString(from) % sshName).str();

[4.4475]

[4.4566]

        result.errorMsg = (format("%1% on ‘%2%’") % readString(from) % machine->sshName).str();

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

B:BD[4.4825] → [10.679:816]

    if (sshName != "localhost") {
        printMsg(lvlDebug, format("copying outputs of ‘%1%’ from ‘%2%’") % drvPath % sshName);

[4.4825]

[10.816]

    if (machine->sshName != "localhost") {
        printMsg(lvlDebug, format("copying outputs of ‘%1%’ from ‘%2%’") % step->drvPath % machine->sshName);

Replacement in src/hydra-queue-runner/build-remote.cc at line 229 [4.85]
B:BD[10.841] → [10.841:883]
```
        for (auto & output : drv.outputs)
```
[10.841]
[10.883]
```
        for (auto & output : step->drv.outputs)
```
Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 11 [3.4840]
B:BD[3.4943] → [4.5824:5851]
```
#include "build-remote.hh"
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 850 [3.4840]

B:BD[8.1069] → [8.1069:1161]

B:BD[8.1161] → [6.1174:1265]

B:BD[6.1265] → [10.1242:1364]

            buildRemote(store, machine->sshName, machine->sshKey, step->drvPath, step->drv,
                logDir, build->maxSilentTime, build->buildTimeout, copyClosureTokenServer,
                result, nrStepsBuilding, nrStepsCopyingTo, nrStepsCopyingFrom,
                bytesSent, bytesReceived);

[8.1069]

[14.1108]

            buildRemote(store, machine, step, build->maxSilentTime, build->buildTimeout, result);

Insertion in src/hydra-queue-runner/state.hh at line 49 [2.1128]

[2.1921]

struct RemoteResult
{
    enum {
        rrSuccess = 0,
        rrPermanentFailure = 1,
        rrTimedOut = 2,
        rrMiscFailure = 3
    } status = rrMiscFailure;
    std::string errorMsg;
    time_t startTime = 0, stopTime = 0;
    nix::Path logFile;
};

Insertion in src/hydra-queue-runner/state.hh at line 282 [2.1128]

[2.8479]

    void buildRemote(std::shared_ptr<nix::StoreAPI> store,
        Machine::ptr machine, Step::ptr step,
        unsigned int maxSilentTime, unsigned int buildTimeout,
        RemoteResult & result);