grahamc/hydra2 - Change SODOV2CMWA4JMIKRQNJ6MD3U3BS2XTSLINLRAG4SFY742IIJNI5QC

Automatically reload $NIX_REMOTE_SYSTEMS when it changes

Otherwise, you'd have to restart the queue runner to add or remove machines.

Created by Eelco Dolstra on June 25, 2015

SODOV2CMWA4JMIKRQNJ6MD3U3BS2XTSLINLRAG4SFY742IIJNI5QC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 183 [8.4840]

B:BD[7.6162] → [4.0:202]

    counter currentJobs{0};
    counter nrStepsDone{0};
    counter totalStepTime{0}; // total time for steps, including closure copying
    counter totalStepBuildTime{0}; // total build time for steps

[7.6162]

[9.6]

    struct State {
        typedef std::shared_ptr<State> ptr;
        counter currentJobs{0};
        counter nrStepsDone{0};
        counter totalStepTime{0}; // total time for steps, including closure copying
        counter totalStepBuildTime{0}; // total build time for steps
    };
    State::ptr state;

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 201 [8.4840]

∅:D[9.190] → [10.745:751]

∅:D[7.6293] → [10.745:751]

B:BD[10.745] → [10.745:751]

∅:D[10.751] → [8.6097:6102]

B:BD[8.6097] → [8.6097:6102]

B:BD[8.6102] → [7.6294:6549]

B:BD[7.6549] → [11.69:101]

∅:D[11.101] → [7.6632:6670]

B:BD[7.6632] → [7.6632:6670]

B:BD[7.6670] → [11.102:134]

    }
};
/* A RAII helper that manages the currentJobs field of Machine
   objects. */
struct MachineReservation
{
    typedef std::shared_ptr<MachineReservation> ptr;
    Machine::ptr machine;
    MachineReservation(Machine::ptr machine) : machine(machine)
    {
        machine->currentJobs++;
    }
    ~MachineReservation()
    {
        machine->currentJobs--;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 234 [8.4840]
B:BD[7.6970] → [7.6970:7016]
```
    typedef std::list<Machine::ptr> Machines;
```
[7.6970]
[7.7016]
```
    typedef std::map<string, Machine::ptr> Machines;
```
Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 236 [8.4840]
[7.7045]
[6.987]
```
    Path machinesFile;
    struct stat machinesFileStat;
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 279 [8.4840]

B:BD[12.901] → [12.901:926]

    void loadMachines();

[12.901]

[8.6539]

    /* (Re)load /etc/nix/machines. */
    void loadMachinesFile();
    /* Thread to reload /etc/nix/machines periodically. */
    void monitorMachinesFile();

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 314 [8.4840]

B:BD[7.7562] → [7.7562:7633]

    void builder(Step::ptr step, MachineReservation::ptr reservation);

[8.7328]

[7.7633]

    void builder(Step::ptr step, Machine::ptr machine, std::shared_ptr<MaintainCount> reservation);

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 355 [8.4840]

[7.7892]

[8.7503]


    machinesFile = getEnv("NIX_REMOTE_SYSTEMS", "/etc/nix/machines");
    machinesFileStat.st_ino = 0;
    machinesFileStat.st_mtime = 0;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 362 [8.4840]
B:BD[7.7895] → [7.7895:7922]
```
void State::loadMachines()
```
[8.7507]
[7.7922]
```
void State::loadMachinesFile()
```
Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 364 [8.4840]
B:BD[7.7924] → [7.7924:7999]
∅:D[7.7999] → [8.7731:7732]
B:BD[8.7731] → [8.7731:7732]
B:BD[8.7732] → [7.8000:8027]
```
    Path machinesFile = getEnv("NIX_REMOTE_SYSTEMS", "/etc/nix/machines");
    Machines newMachines;
```
[7.7924]
[7.8027]
```
    string contents;
```

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 366 [8.4840]

[7.8063]

        struct stat st;
        if (stat(machinesFile.c_str(), &st) != 0)
            throw SysError(format("getting stats about ‘%1%’") % machinesFile);
        if (st.st_ino == machinesFileStat.st_ino && st.st_mtime == machinesFileStat.st_mtime)
            return;
        printMsg(lvlDebug, "reloading machines");
        contents = readFile(machinesFile);
        machinesFileStat = st;
    } else {
        StringSet systems = StringSet({settings.thisSystem});
        if (settings.thisSystem == "x86_64-linux")
            systems.insert("i686-linux");
        contents = "localhost " + concatStringsSep(",", systems)
            + " - " + int2String(settings.maxBuildJobs) + " 1";
    }

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 382 [8.4840]

B:BD[7.8064] → [7.8064:8353]

        for (auto line : tokenizeString<Strings>(readFile(machinesFile), "\n")) {
            line = trim(string(line, 0, line.find('#')));
            auto tokens = tokenizeString<std::vector<std::string>>(line);
            if (tokens.size() < 3) continue;
            tokens.resize(7);

[7.8064]

[7.8353]

    Machines newMachines, oldMachines;
    {
        auto machines_(machines.lock());
        oldMachines = *machines_;
    }

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 388 [8.4840]

B:BD[7.8354] → [7.8354:8944]

B:BD[7.8944] → [13.339:449]

∅:D[13.449] → [7.8944:8998]

B:BD[7.8944] → [7.8944:8998]

            auto machine = std::make_shared<Machine>();
            machine->sshName = tokens[0];
            machine->systemTypes = tokenizeString<StringSet>(tokens[1], ",");
            machine->sshKey = tokens[2];
            if (tokens[3] != "")
                string2Int(tokens[3], machine->maxJobs);
            else
                machine->maxJobs = 1;
            machine->speedFactor = atof(tokens[4].c_str());
            machine->supportedFeatures = tokenizeString<StringSet>(tokens[5], ",");
            machine->mandatoryFeatures = tokenizeString<StringSet>(tokens[6], ",");
            for (auto & f : machine->mandatoryFeatures)
                machine->supportedFeatures.insert(f);
            newMachines.push_back(machine);
        }

[7.8354]

[8.7732]

    for (auto line : tokenizeString<Strings>(contents, "\n")) {
        line = trim(string(line, 0, line.find('#')));
        auto tokens = tokenizeString<std::vector<std::string>>(line);
        if (tokens.size() < 3) continue;
        tokens.resize(7);

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 394 [8.4840]
B:BD[8.7733] → [7.8999:9012]
```
    } else {
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 395 [8.4840]

B:BD[7.9064] → [7.9064:9365]

        machine->sshName = "localhost";
        machine->systemTypes = StringSet({settings.thisSystem});
        if (settings.thisSystem == "x86_64-linux")
            machine->systemTypes.insert("i686-linux");
        machine->maxJobs = settings.maxBuildJobs;
        newMachines.push_back(machine);

[7.9064]

[7.9365]

        machine->sshName = tokens[0];
        machine->systemTypes = tokenizeString<StringSet>(tokens[1], ",");
        machine->sshKey = tokens[2];
        if (tokens[3] != "")
            string2Int(tokens[3], machine->maxJobs);
        else
            machine->maxJobs = 1;
        machine->speedFactor = atof(tokens[4].c_str());
        machine->supportedFeatures = tokenizeString<StringSet>(tokens[5], ",");
        machine->mandatoryFeatures = tokenizeString<StringSet>(tokens[6], ",");
        for (auto & f : machine->mandatoryFeatures)
            machine->supportedFeatures.insert(f);
        /* Re-use the State object of the previous machine with the
           same name. */
        auto i = oldMachines.find(machine->sshName);
        if (i == oldMachines.end())
            printMsg(lvlChatty, format("adding new machine ‘%1%’") % machine->sshName);
        else
            printMsg(lvlChatty, format("updating machine ‘%1%’") % machine->sshName);
        machine->state = i == oldMachines.end()
            ? std::make_shared<Machine::State>()
            : i->second->state;
        newMachines[machine->sshName] = machine;

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 420 [8.4840]

[7.9371]


    for (auto & m : oldMachines)
        if (newMachines.find(m.first) == newMachines.end())
            printMsg(lvlInfo, format("removing machine ‘%1%’") % m.first);

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 427 [8.4840]

[7.9439]

}
void State::monitorMachinesFile()
{
    while (true) {
        try {
            // FIXME: use inotify.
            sleep(60);
            loadMachinesFile();
        } catch (std::exception & e) {
            printMsg(lvlError, format("reloading machines file: %1%") % e.what());
        }
    }

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 658 [8.4840]

B:BD[2.230] → [2.230:307]

                        if (m->supportsStep(r)) { supported = true; break; }

[2.230]

[2.307]

                        if (m.second->supportsStep(r)) { supported = true; break; }

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 935 [8.4840]

B:BD[3.442] → [3.442:509]

                    machinesSorted.push_back({m, m->currentJobs});

[3.442]

[11.466]

                    machinesSorted.push_back({m.second, m.second->state->currentJobs});

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 968 [8.4840]

B:BD[11.1882] → [3.972:1050]

                if (mi.machine->currentJobs >= mi.machine->maxJobs) continue;

[11.1882]

[11.1954]

                if (mi.machine->state->currentJobs >= mi.machine->maxJobs) continue;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1005 [8.4840]

B:BD[11.3244] → [3.1111:1200]

                    auto reservation = std::make_shared<MachineReservation>(mi.machine);

[11.3244]

[11.3330]

                    auto reservation = std::make_shared<MaintainCount>(mi.machine->state->currentJobs);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1008 [8.4840]

B:BD[11.3376] → [11.3376:3472]

                    auto builderThread = std::thread(&State::builder, this, step, reservation);

[11.3376]

[11.3472]

                    auto builderThread = std::thread(&State::builder, this, step, mi.machine, reservation);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1042 [8.4840]

B:BD[7.12578] → [7.12578:12651]

void State::builder(Step::ptr step, MachineReservation::ptr reservation)

[7.12578]

[7.12651]

void State::builder(Step::ptr step, Machine::ptr machine, std::shared_ptr<MaintainCount> reservation)

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1050 [8.4840]
B:BD[7.12712] → [14.2750:2814]
```
        retry = doBuildStep(store, step, reservation->machine);
```
[7.12712]
[7.12768]
```
        retry = doBuildStep(store, step, machine);
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1053 [8.4840]

B:BD[14.2908] → [14.2908:2981]

            % step->drvPath % reservation->machine->sshName % e.what());

[14.2908]

[7.12955]

            % step->drvPath % machine->sshName % e.what());

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1398 [8.4840]

B:BD[15.526] → [4.273:432]

    machine->nrStepsDone++;
    machine->totalStepTime += stepStopTime - stepStartTime;
    machine->totalStepBuildTime += result.stopTime - result.startTime;

[15.526]

    machine->state->nrStepsDone++;
    machine->state->totalStepTime += stepStopTime - stepStartTime;
    machine->state->totalStepBuildTime += result.stopTime - result.startTime;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1603 [8.4840]

B:BD[16.1754] → [16.1754:1796]

            for (auto & m : *machines_) {

[16.1754]

[16.1796]

            for (auto & i : *machines_) {
                auto & m(i.second);
                auto & s(m->state);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1608 [8.4840]

B:BD[16.1878] → [16.1878:1939]

B:BD[16.1939] → [4.632:1087]

                nested2.attr("currentJobs", m->currentJobs);
                nested2.attr("nrStepsDone", m->nrStepsDone);
                if (m->nrStepsDone) {
                    nested2.attr("totalStepTime", m->totalStepTime);
                    nested2.attr("totalStepBuildTime", m->totalStepBuildTime);
                    nested2.attr("avgStepTime"); out << (float) m->totalStepTime / m->nrStepsDone;
                    nested2.attr("avgStepBuildTime"); out << (float) m->totalStepBuildTime / m->nrStepsDone;

[16.1878]

[4.1087]

                nested2.attr("currentJobs", s->currentJobs);
                nested2.attr("nrStepsDone", s->nrStepsDone);
                if (m->state->nrStepsDone) {
                    nested2.attr("totalStepTime", s->totalStepTime);
                    nested2.attr("totalStepBuildTime", s->totalStepBuildTime);
                    nested2.attr("avgStepTime"); out << (float) s->totalStepTime / s->nrStepsDone;
                    nested2.attr("avgStepBuildTime"); out << (float) s->totalStepBuildTime / s->nrStepsDone;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1711 [8.4840]
B:BD[17.3286] → [7.14685:14705]
```
    loadMachines();
```
[17.3286]
[17.3363]
```
    loadMachinesFile();
```
Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 1713 [8.4840]
[17.3364]
[5.2667]
```
    std::thread(&State::monitorMachinesFile, this).detach();
```