grahamc/hydra - Change IKJBYIGY3JABFXD2KOAQNA52ULE6VR4PBFKHWAHHBITXX5KC76MAC

Update to reflect BinaryCacheStore changes

BinaryCacheStore no longer implements buildPaths() and ensurePath(), so we need to use copyPath() / copyClosure().

Created by Eelco Dolstra on October 7, 2016

IKJBYIGY3JABFXD2KOAQNA52ULE6VR4PBFKHWAHHBITXX5KC76MAC

Dependencies

In channels

upstream

main

Change contents

Insertion in hydra-module.nix at line 233 [8.1]

[6.232]

[7.373]

        use-substitutes ${if cfg.useSubstitutes then "1" else "0"}

Replacement in hydra-module.nix at line 329 [8.1]

B:BD[9.1684] → [4.0:169]

          { ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v --option build-use-substitutes ${if cfg.useSubstitutes then "true" else "false"}";

[9.1684]

[10.85]

          { ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v";

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

B:BD[2.2491] → [2.2491:2542]

        destStore->buildPaths(basicDrv.inputSrcs);

[2.2491]

[11.3876]

        copyClosure(ref<Store>(localStore), destStore, basicDrv.inputSrcs);

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 71 [14.4840]
∅:D[12.566] → [13.1542:1546]
∅:D[15.979] → [13.1542:1546]
B:BD[11.7892] → [13.1542:1546]
B:BD[13.1546] → [16.755:789]
∅:D[17.659] → [13.1580:1582]
∅:D[16.789] → [13.1580:1582]
B:BD[13.1580] → [13.1580:1582]
B:BD[13.1582] → [16.790:826]
```
}
ref<Store> State::getLocalStore()
{
    return ref<Store>(_localStore);
```
Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 794 [14.4840]
B:BD[16.828] → [16.828:859]
```
    _localStore = openStore();
```
[16.828]
[18.4619]
```
    localStore = openStore();
```
Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 797 [14.4840]
∅:D[5.67] → [16.860:894]
B:BD[19.662] → [16.860:894]
```
        _destStore = _localStore;
```
[5.67]
[5.68]
```
        _destStore = localStore;
```

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 801 [14.4840]

[19.1249]


    auto isTrue = [](const std::string & s) {
        return s == "1" || s == "true";
    };
    useSubstitutes = isTrue(hydraConfig["use-substitutes"]);

Deletion in src/hydra-queue-runner/queue-monitor.cc at line 32 [20.20067]
B:BD[20.20720] → [13.12280:12319]
```
    auto localStore = getLocalStore();
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 37 [20.20067]

B:BD[20.20820] → [16.1270:1350]

        bool done = getQueuedBuilds(*conn, localStore, destStore, lastBuildId);

[20.20820]

[20.20872]

        bool done = getQueuedBuilds(*conn, destStore, lastBuildId);

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 71 [20.20067]
∅:D[3.127] → [13.12438:12508]
B:BD[20.21512] → [13.12438:12508]
```
bool State::getQueuedBuilds(Connection & conn, ref<Store> localStore,
```
[3.127]
[13.12508]
```
bool State::getQueuedBuilds(Connection & conn,
```
Deletion in src/hydra-queue-runner/queue-monitor.cc at line 417 [20.20067]
B:BD[21.1605] → [21.1605:1631]
```
    PathSet missingPaths;
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 421 [20.20067]

B:BD[21.1712] → [21.1712:1760]

            missingPaths.insert(i.second.path);

[21.1712]

[21.1760]

        }
    /* Try to copy the missing paths from the local store or from
       substitutes. */
    if (!missing.empty()) {
        size_t avail = 0;
        for (auto & i : missing) {
            if (/* localStore != destStore && */ localStore->isValidPath(i.second.path))
                avail++;
            else if (useSubstitutes) {
                SubstitutablePathInfos infos;
                localStore->querySubstitutablePathInfos({i.second.path}, infos);
                if (infos.size() == 1)
                    avail++;
            }

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 439 [20.20067]

B:BD[21.1771] → [21.1771:2120]

B:BD[21.2120] → [13.12926:13004]

∅:D[13.13004] → [21.2185:2236]

B:BD[21.2185] → [21.2185:2236]

    /* Try to substitute the missing paths. Note: can't use the more
       efficient querySubstitutablePaths() here because upstream Hydra
       servers don't allow it (they have "WantMassQuery: 0"). */
    assert(missing.size() == missingPaths.size());
    if (!missing.empty() && settings.useSubstitutes) {
        SubstitutablePathInfos infos;
        destStore->querySubstitutablePathInfos(missingPaths, infos); // FIXME
        if (infos.size() == missingPaths.size()) {

[21.1771]

[21.2236]

        if (missing.size() == avail) {

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 443 [20.20067]

B:BD[21.2323] → [21.2323:2442]

                    printMsg(lvlInfo, format("substituting output ‘%1%’ of ‘%2%’") % i.second.path % drvPath);

[21.2323]

[21.2442]

                    time_t startTime = time(0);
                    if (localStore->isValidPath(i.second.path))
                        printInfo("copying output ‘%1%’ of ‘%2%’ from local store", i.second.path, drvPath);
                    else {
                        printInfo("substituting output ‘%1%’ of ‘%2%’", i.second.path, drvPath);
                        localStore->ensurePath(i.second.path);
                        // FIXME: should copy directly from substituter to destStore.
                    }
                    copyClosure(ref<Store>(localStore), destStore, {i.second.path});

Deletion in src/hydra-queue-runner/queue-monitor.cc at line 455 [20.20067]

B:BD[21.2443] → [21.2443:2491]

B:BD[21.2491] → [13.13005:13063]

                    time_t startTime = time(0);
                    destStore->ensurePath(i.second.path);

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 465 [20.20067]

[21.2872]

                    printError("while copying/substituting output ‘%s’ of ‘%s’: %s", i.second.path, drvPath, e.what());

Insertion in src/hydra-queue-runner/state.hh at line 259 [22.1128]
[19.1870]
[22.4416]
```
    bool useSubstitutes = false;
```
Replacement in src/hydra-queue-runner/state.hh at line 379 [22.1128]
B:BD[22.6778] → [16.2286:2331]
```
    std::shared_ptr<nix::Store> _localStore;
```
[22.6778]
[15.1458]
```
    std::shared_ptr<nix::Store> localStore;
```
Deletion in src/hydra-queue-runner/state.hh at line 405 [22.1128]
B:BD[12.946] → [12.946:947]
∅:D[12.947] → [13.13176:13272]
B:BD[13.13176] → [13.13176:13272]
B:BD[13.13272] → [16.2332:2374]
```
    /* Return a store object that can access derivations produced by
       hydra-evaluator. */
    nix::ref<nix::Store> getLocalStore();
```

Replacement in src/hydra-queue-runner/state.hh at line 437 [22.1128]

B:BD[23.2260] → [13.13413:13490]

    bool getQueuedBuilds(Connection & conn, nix::ref<nix::Store> localStore,

[23.2260]

[13.13490]

    bool getQueuedBuilds(Connection & conn,

Update to reflect BinaryCacheStore changes

Dependencies

In channels

Change contents

Insertion in hydra-module.nix at line 233 [8.1]

Replacement in hydra-module.nix at line 329 [8.1]

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

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 71 [14.4840]

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 794 [14.4840]

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 797 [14.4840]

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 801 [14.4840]

Deletion in src/hydra-queue-runner/queue-monitor.cc at line 32 [20.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 37 [20.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 71 [20.20067]

Deletion in src/hydra-queue-runner/queue-monitor.cc at line 417 [20.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 421 [20.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 439 [20.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 443 [20.20067]

Deletion in src/hydra-queue-runner/queue-monitor.cc at line 455 [20.20067]

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 465 [20.20067]

Insertion in src/hydra-queue-runner/state.hh at line 259 [22.1128]

Replacement in src/hydra-queue-runner/state.hh at line 379 [22.1128]

Deletion in src/hydra-queue-runner/state.hh at line 405 [22.1128]

Replacement in src/hydra-queue-runner/state.hh at line 437 [22.1128]