grahamc/hydra - Change BAFICF73XUYNAYT6T6X7GQIFHG6CLGPYYNFBMC6ON6SVPNOXO6RAC

Support hydra-build-products on binary cache stores

Created by Eelco Dolstra on February 26, 2016

BAFICF73XUYNAYT6T6X7GQIFHG6CLGPYYNFBMC6ON6SVPNOXO6RAC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/hydra-queue-runner/build-result.cc at line 5 [4.441]
[3.20]
[4.531]
```
#include "fs-accessor.hh"
```

Deletion in src/hydra-queue-runner/build-result.cc at line 8 [4.441]

B:BD[4.553] → [5.0:402]


static std::tuple<bool, string> secureRead(Path fileName)
{
    auto fail = std::make_tuple(false, "");
    if (!pathExists(fileName)) return fail;
    try {
        /* For security, resolve symlinks. */
        fileName = canonPath(fileName, true);
        if (!isInStore(fileName)) return fail;
        return std::make_tuple(true, readFile(fileName));
    } catch (Error & e) { return fail; }
}

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

B:BD[4.555] → [6.419:493]

BuildOutput getBuildOutput(nix::ref<Store> store, const Derivation & drv)

[4.555]

[4.606]

BuildOutput getBuildOutput(nix::ref<Store> store,
    nix::ref<nix::FSAccessor> accessor, const Derivation & drv)

Deletion in src/hydra-queue-runner/build-result.cc at line 31 [4.441]
B:BD[4.1146] → [2.1107:1113]
```
#if 0
```

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

B:BD[7.58] → [7.58:113]

        if (pathExists(failedFile)) res.failed = true;

[7.58]

[7.113]

        if (accessor->stat(failedFile).type == FSAccessor::Type::tRegular)
            res.failed = true;

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

B:BD[7.114] → [5.403:523]

        auto file = secureRead(output + "/nix-support/hydra-build-products");
        if (!std::get<0>(file)) continue;

[7.114]

[5.523]

        Path productsFile = output + "/nix-support/hydra-build-products";
        if (accessor->stat(productsFile).type != FSAccessor::Type::tRegular)
            continue;

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

B:BD[4.1339] → [5.525:604]

        for (auto & line : tokenizeString<Strings>(std::get<1>(file), "\n")) {

[4.1339]

[3.640]

        for (auto & line : tokenizeString<Strings>(accessor->readFile(productsFile), "\n")) {

Insertion in src/hydra-queue-runner/build-result.cc at line 64 [4.441]

[8.629]

[4.2316]

            // FIXME: should we disallow products referring to other
            // store paths, or that are outside the input closure?

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

B:BD[4.2388] → [3.976:1102]

∅:D[3.1102] → [4.2446:2527]

B:BD[4.2446] → [4.2446:2527]

            try {
                product.path = canonPath(product.path, true);
            } catch (Error & e) { continue; }
            if (!isInStore(product.path) || !pathExists(product.path)) continue;

[4.2388]

[4.2527]

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

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

B:BD[4.2528] → [4.2528:2628]

            /*  FIXME: check that the path is in the input closure
                of the build? */

[4.2528]

[4.2628]

            auto st = accessor->stat(product.path);
            if (st.type == FSAccessor::Type::tMissing) continue;

Deletion in src/hydra-queue-runner/build-result.cc at line 74 [4.441]

B:BD[4.2712] → [4.2712:2876]


            struct stat st;
            if (stat(product.path.c_str(), &st))
                throw SysError(format("getting status of ‘%1%’") % product.path);

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

B:BD[4.2877] → [4.2877:2916]

            if (S_ISREG(st.st_mode)) {

[4.2877]

[4.2916]

            if (st.type == FSAccessor::Type::tRegular) {

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

B:BD[4.2958] → [4.2958:3143]

                product.fileSize = st.st_size;
                product.sha1hash = hashFile(htSHA1, product.path);
                product.sha256hash = hashFile(htSHA256, product.path);

[4.2958]

[4.3143]

                product.fileSize = st.fileSize;
                auto contents = accessor->readFile(product.path);
                product.sha1hash = hashString(htSHA1, contents);
                product.sha256hash = hashString(htSHA256, contents);

Deletion in src/hydra-queue-runner/build-result.cc at line 86 [4.441]
B:BD[4.3219] → [2.1114:1121]
```
#endif
```

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

B:BD[4.3665] → [2.1122:1128]

∅:D[2.1128] → [4.3665:3865]

B:BD[4.3665] → [4.3665:3865]

B:BD[4.3865] → [2.1129:1136]

#if 0
            struct stat st;
            if (stat(product.path.c_str(), &st))
                throw SysError(format("getting status of ‘%1%’") % product.path);
            if (S_ISDIR(st.st_mode))
#endif

[4.3665]

[4.3865]

            auto st = accessor->stat(product.path);
            if (st.type == FSAccessor::Type::tMissing)
                throw Error(format("getting status of ‘%1%’") % product.path);
            if (st.type == FSAccessor::Type::tDirectory)

Deletion in src/hydra-queue-runner/build-result.cc at line 105 [4.441]
B:BD[4.3931] → [2.1137:1143]
```
#if 0
```

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

B:BD[4.4104] → [4.4104:4142]

        if (!pathExists(p)) continue;

[4.4104]

[3.1103]

        if (accessor->stat(p).type != FSAccessor::Type::tRegular) continue;

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

B:BD[3.1117] → [3.1117:1166]

            res.releaseName = trim(readFile(p));

[3.1117]

[3.1166]

            res.releaseName = trim(accessor->readFile(p));

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

B:BD[5.664] → [5.664:814]

        auto file = secureRead(output + "/nix-support/hydra-metrics");
        for (auto & line : tokenizeString<Strings>(std::get<1>(file), "\n")) {

[5.664]

[5.814]

        Path metricsFile = output + "/nix-support/hydra-metrics";
        if (accessor->stat(metricsFile).type != FSAccessor::Type::tRegular) continue;
        for (auto & line : tokenizeString<Strings>(accessor->readFile(metricsFile), "\n")) {

Deletion in src/hydra-queue-runner/build-result.cc at line 129 [4.441]
B:BD[5.1208] → [2.1144:1151]
```
#endif
```
Insertion in src/hydra-queue-runner/build-result.hh at line 7 [4.4329]
[4.4389]
[4.4389]
```
#include "store-api.hh"
```

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

B:BD[4.4741] → [6.545:630]

BuildOutput getBuildOutput(nix::ref<nix::Store> store, const nix::Derivation & drv);

[4.4741]

BuildOutput getBuildOutput(nix::ref<nix::Store> store,
    nix::ref<nix::FSAccessor> accessor, const nix::Derivation & drv);

Replacement in src/hydra-queue-runner/builder.cc at line 129 [9.133]

B:BD[9.4608] → [2.1433:1507]

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

[9.4608]

[9.4678]

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

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 162 [9.20067]

B:BD[9.24924] → [2.12757:12819]

            BuildOutput res = getBuildOutput(destStore, drv);

[9.24924]

[9.24982]

            BuildOutput res = getBuildOutput(destStore, destStore->getFSAccessor(), drv);