grahamc/hydra2 - Change V2UCCYN3B6266BDKGSXQDRSW4HKY673GINM3VI3MORXZ7OYDJBXAC

hydra-queue-runner: Get store mode configuration from hydra.conf

To use the local Nix store (default):

store_mode = direct

To use a local binary cache:

store_mode = local-binary-cache binary_cache_dir = /var/lib/hydra/binary-cache

To use an S3 bucket:

store_mode = s3-binary-cache binary_cache_s3_bucket = my-nix-bucket

Also, respect binary_cache_{secret,public}_key_file for signing the binary cache.

Created by Eelco Dolstra on February 22, 2016

V2UCCYN3B6266BDKGSXQDRSW4HKY673GINM3VI3MORXZ7OYDJBXAC

Dependencies

In channels

main

Change contents

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 25 [4.4840]

[3.7840]


    /* Read hydra.conf. */
    auto hydraConfigFile = getEnv("HYDRA_CONFIG");
    if (pathExists(hydraConfigFile)) {
        for (auto line : tokenizeString<Strings>(readFile(hydraConfigFile), "\n")) {
            line = trim(string(line, 0, line.find('#')));
            auto eq = line.find('=');
            if (eq == std::string::npos) continue;
            auto key = trim(std::string(line, 0, eq));
            auto value = trim(std::string(line, eq + 1));
            if (key == "") continue;

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 41 [4.4840]
[3.7841]
[3.7841]
```
            hydraConfig[key] = value;
        }
    }
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 749 [4.4840]

B:BD[5.4400] → [5.4400:4619]

#if 0
    auto store = make_ref<LocalBinaryCacheStore>(getLocalStore(),
        "/home/eelco/Misc/Keys/test.nixos.org/secret",
        "/home/eelco/Misc/Keys/test.nixos.org/public",
        "/tmp/binary-cache");
#endif

[5.4400]

[5.4619]

    auto storeMode = hydraConfig["store_mode"];

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 751 [4.4840]

B:BD[5.4620] → [5.4620:4675]

B:BD[5.4675] → [2.715:866]

∅:D[2.866] → [5.4853:4896]

B:BD[5.4853] → [5.4853:4896]

    auto store = std::make_shared<S3BinaryCacheStore>(
        [this]() { return this->getLocalStore(); },
        "/home/eelco/hydra/secret",
        "/home/eelco/hydra/public",
        "nix-test-cache");
    store->init();
    _destStore = store;

[5.4620]

[6.643]

    if (storeMode == "direct" || storeMode == "") {
        _destStore = openStore();
    }
    else if (storeMode == "local-binary-cache") {
        auto dir = hydraConfig["binary_cache_dir"];
        if (dir == "")
            throw Error("you must set ‘binary_cache_dir’ in hydra.conf");
        auto store = make_ref<LocalBinaryCacheStore>(
            [this]() { return this->getLocalStore(); },
            "/home/eelco/Misc/Keys/test.nixos.org/secret",
            "/home/eelco/Misc/Keys/test.nixos.org/public",
            dir);
        store->init();
        _destStore = std::shared_ptr<LocalBinaryCacheStore>(store);
    }
    else if (storeMode == "s3-binary-cache") {
        auto bucketName = hydraConfig["binary_cache_s3_bucket"];
        if (bucketName == "")
            throw Error("you must set ‘binary_cache_s3_bucket’ in hydra.conf");
        auto store = make_ref<S3BinaryCacheStore>(
            [this]() { return this->getLocalStore(); },
            hydraConfig["binary_cache_secret_key_file"],
            hydraConfig["binary_cache_public_key_file"],
            bucketName);
        store->init();
        _destStore = std::shared_ptr<S3BinaryCacheStore>(store);
    }

Insertion in src/hydra-queue-runner/state.hh at line 264 [8.1128]
[7.437]
[8.4416]
```
    std::map<std::string, std::string> hydraConfig;
```