grahamc/hydra - Change XCDTFZUYSOYEARMJCV4ORVQWG2VWZQ43HU2U63RBECP53OSCM2GQC

hydra-queue-runner: Fix build

Created by Eelco Dolstra on October 6, 2016

XCDTFZUYSOYEARMJCV4ORVQWG2VWZQ43HU2U63RBECP53OSCM2GQC

Dependencies

In channels

upstream

main

Change contents

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

B:BD[6.584] → [6.584:635]

        if (dup2(to.readSide, STDIN_FILENO) == -1)

[6.584]

[6.635]

        if (dup2(to.readSide.get(), STDIN_FILENO) == -1)

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

B:BD[6.698] → [6.698:753]

        if (dup2(from.writeSide, STDOUT_FILENO) == -1)

[6.698]

[6.753]

        if (dup2(from.writeSide.get(), STDOUT_FILENO) == -1)

Replacement in src/hydra-queue-runner/build-remote.cc at line 70 [6.85]
B:BD[6.1153] → [6.1153:1206]
```
    to.readSide.close();
    from.writeSide.close();
```
[6.1153]
[6.1206]
```
    to.readSide = -1;
    from.writeSide = -1;
```

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

B:BD[6.1207] → [6.1207:1286]

    child.to = to.writeSide.borrow();
    child.from = from.readSide.borrow();

[6.1207]

[6.1286]

    child.to = to.writeSide.release();
    child.from = from.readSide.release();

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

B:BD[6.2087] → [6.2087:2137]

    auto present = readStorePaths<PathSet>(from);

[6.2087]

[6.2137]

    auto present = readStorePaths<PathSet>(*destStore, from);

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

B:BD[6.3078] → [7.171:353]

    AutoCloseFD logFD(open(result.logFile.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0666));
    if (logFD == -1) throw SysError(format("creating log file ‘%1%’") % result.logFile);

[6.3078]

[6.3246]

    AutoCloseFD logFD = open(result.logFile.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0666);
    if (!logFD) throw SysError(format("creating log file ‘%1%’") % result.logFile);

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

B:BD[4.32] → [4.32:87]

        openConnection(machine, tmpDir, logFD, child);

[4.32]

[6.3335]

        openConnection(machine, tmpDir, logFD.get(), child);

Replacement in src/hydra-queue-runner/build-remote.cc at line 139 [6.85]
B:BD[6.3336] → [4.88:111]
```
        logFD.close();
```
[6.3336]
[8.23]
```
        logFD = -1;
```

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

B:BD[8.24] → [4.112:176]

        FdSource from(child.from);
        FdSink to(child.to);

[8.24]

[6.3392]

        FdSource from(child.from.get());
        FdSink to(child.to.get());

Replacement in src/hydra-queue-runner/build-remote.cc at line 371 [6.85]
B:BD[4.9154] → [4.9154:9180]
```
        child.to.close();
```
[4.9154]
[4.9180]
```
        child.to = -1;
```

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

B:BD[9.707] → [9.707:759]

            if (!isInStore(product.path)) continue;

[9.707]

[10.2527]

            if (!store->isInStore(product.path)) continue;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 14 [10.4840]
B:BD[10.5036] → [11.0:28]
```
#include "value-to-json.hh"
```
[10.5036]
[10.5036]
```
#include "json.hh"
#include "s3-binary-cache-store.hh"
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 455 [10.4840]

B:BD[7.2122] → [7.2122:2173]

                if (dup2(fd, STDOUT_FILENO) == -1)

[7.2122]

[7.2173]

                if (dup2(fd.get(), STDOUT_FILENO) == -1)

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 586 [10.4840]

B:BD[3.55] → [3.55:163]

        root.attr("buildReadTimeAvgMs", nrBuildsRead == 0 ? 0.0 :  (float) buildReadTimeMs / nrBuildsRead);

[3.55]

[11.1270]

        root.attr("buildReadTimeAvgMs", nrBuildsRead == 0 ? 0.0 : (float) buildReadTimeMs / nrBuildsRead);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 607 [10.4840]

B:BD[11.1638] → [11.1638:1709]

            root.attr("machines");
            JSONObject nested(out);

[11.1638]

[11.1709]

            auto nested = root.object("machines");

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 612 [10.4840]

∅:D[12.4577] → [11.1796:1878]

B:BD[11.1796] → [11.1796:1878]

                nested.attr(m->sshName);
                JSONObject nested2(out);

[12.4577]

[2.372]

                auto nested2 = nested.object(m->sshName);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 633 [10.4840]

B:BD[13.1740] → [13.1740:1810]

            root.attr("jobsets");
            JSONObject nested(out);

[13.1740]

[13.1810]

            auto nested = root.object("jobsets");

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 636 [10.4840]

B:BD[13.1899] → [13.1899:2017]

                nested.attr(jobset.first.first + ":" + jobset.first.second);
                JSONObject nested2(out);

[13.1899]

[14.1709]

                auto nested2 = nested.object(jobset.first.first + ":" + jobset.first.second);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 643 [10.4840]

B:BD[15.1946] → [15.1946:2021]

            root.attr("machineTypes");
            JSONObject nested(out);

[15.1946]

[15.2021]

            auto nested = root.object("machineTypes");

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 646 [10.4840]

B:BD[15.2120] → [15.2120:2199]

                nested.attr(i.first);
                JSONObject nested2(out);

[15.2120]

[15.2199]

                auto nested2 = nested.object(i.first);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 659 [10.4840]
B:BD[14.1782] → [5.158:218]
```
        root.attr("store");
        JSONObject nested(out);
```
[14.1782]
[14.1857]
```
        auto nested = root.object("store");
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 686 [10.4840]

B:BD[5.1575] → [5.1575:1643]

            nested.attr("s3");
            JSONObject nested2(out);

[5.1575]

[5.1643]

            auto nested2 = nested.object("s3");