grahamc/hydra - Change ZVSHXE3KY43J5BBDGERORR2FAVDG4ARANUUSGIYDHUN767SQ4GAQC

Allow setting GC_INITIAL_HEAP_SIZE for hydra-eval-jobs

This cannot be done in the hydra-evaluator systemd unit, since then every other Nix process (e.g. hydra-evaluator and nix-prefetch-*) will also allocate the specified heap size, probably leading to OOM.

Created by Eelco Dolstra on May 16, 2018

ZVSHXE3KY43J5BBDGERORR2FAVDG4ARANUUSGIYDHUN767SQ4GAQC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/hydra-eval-jobs/Makefile.am at line 5 [8.17930]
∅:D[6.152] → [7.286:287]
∅:D[9.318] → [7.286:287]
B:BD[7.286] → [7.286:287]
B:BD[7.287] → [9.319:347]
```
AM_CXXFLAGS = $(NIX_CFLAGS)
```
[9.318]
```
hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra
```
Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 15 [10.303]
[5.31]
[10.451]
```
#include "hydra-config.hh"
```

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 162 [10.303]

[11.80]


        auto config = std::make_unique<::Config>();
        auto initialHeapSize = config->getStrOption("evaluator_initial_heap_size", "");
        if (initialHeapSize != "")
            setenv("GC_INITIAL_HEAP_SIZE", initialHeapSize.c_str(), 1);

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 13 [12.4840]
B:BD[12.4993] → [12.4993:5014]
```
#include "shared.hh"
```
Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 14 [12.4840]
[12.5036]
[13.736]
```
#include "hydra-config.hh"
```
Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 17 [12.4840]
[13.791]
[12.5036]
```
#include "shared.hh"
```

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 31 [12.4840]

∅:D[4.335] → [14.0:14]

B:BD[15.22] → [14.0:14]

∅:D[14.14] → [12.7501:7503]

∅:D[16.64] → [12.7501:7503]

∅:D[17.65] → [12.7501:7503]

∅:D[18.65] → [12.7501:7503]

∅:D[19.617] → [12.7501:7503]

∅:D[20.1126] → [12.7501:7503]

∅:D[21.1419] → [12.7501:7503]

B:BD[12.7501] → [12.7501:7503]

B:BD[12.7503] → [14.15:63]

∅:D[14.63] → [22.0:1]

B:BD[23.7840] → [22.0:1]

B:BD[22.1] → [14.64:212]

∅:D[14.212] → [22.118:119]

B:BD[22.118] → [22.118:119]

B:BD[22.119] → [14.213:364]

∅:D[14.364] → [22.262:263]

B:BD[22.262] → [22.262:263]

B:BD[22.263] → [14.365:462]

∅:D[14.462] → [22.352:353]

B:BD[22.352] → [22.352:353]

B:BD[22.353] → [14.463:584]

∅:D[14.584] → [22.466:467]

B:BD[22.466] → [22.466:467]

B:BD[22.467] → [14.585:626]

∅:D[22.504] → [23.7840:7841]

∅:D[14.626] → [23.7840:7841]

B:BD[23.7840] → [23.7840:7841]

B:BD[23.7841] → [14.627:679]

∅:D[14.679] → [22.543:560]

B:BD[22.543] → [22.543:560]

B:BD[22.560] → [14.680:764]

∅:D[14.764] → [24.3819:3825]

B:BD[22.560] → [24.3819:3825]

B:BD[24.3825] → [14.765:972]

B:BD[14.972] → [2.0:65]

∅:D[2.65] → [14.1036:1151]

B:BD[14.1036] → [14.1036:1151]

B:BD[14.1151] → [3.598:683]

∅:D[3.683] → [24.3932:3938]

∅:D[14.1214] → [24.3932:3938]

B:BD[24.3932] → [24.3932:3938]

B:BD[24.3938] → [14.1215:1220]

struct Config
{
    std::map<std::string, std::string> options;
    Config()
    {
        /* 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;
                options[key] = value;
            }
        }
    }
    std::string getStrOption(const std::string & key, const std::string & def = "")
    {
        auto i = options.find(key);
        return i == options.end() ? def : i->second;
    }
    uint64_t getIntOption(const std::string & key, uint64_t def = 0)
    {
        auto i = options.find(key);
        return i == options.end() ? def : std::stoll(i->second);
    }
    bool getBoolOption(const std::string & key, bool def = false)
    {
        auto i = options.find(key);
        return i == options.end() ? def : (i->second == "true" || i->second == "1");
    }
};

File addition: hydra-config.hh (----------)

[25.9041]

#pragma once
#include <map>
#include "util.hh"
struct Config
{
    std::map<std::string, std::string> options;
    Config()
    {
        using namespace nix;
        /* 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;
                options[key] = value;
            }
        }
    }
    std::string getStrOption(const std::string & key, const std::string & def = "")
    {
        auto i = options.find(key);
        return i == options.end() ? def : i->second;
    }
    uint64_t getIntOption(const std::string & key, uint64_t def = 0)
    {
        auto i = options.find(key);
        return i == options.end() ? def : std::stoll(i->second);
    }
    bool getBoolOption(const std::string & key, bool def = false)
    {
        auto i = options.find(key);
        return i == options.end() ? def : (i->second == "true" || i->second == "1");
    }
};

Allow setting GC_INITIAL_HEAP_SIZE for hydra-eval-jobs

Dependencies

In channels

Change contents

Replacement in src/hydra-eval-jobs/Makefile.am at line 5 [8.17930]

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 15 [10.303]

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 162 [10.303]

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 13 [12.4840]

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 14 [12.4840]

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 17 [12.4840]

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 31 [12.4840]

File addition: hydra-config.hh (----------)