grahamc/hydra2 - Change HHOMBU7GGRAEXODSDY3WUHQGOSQ35OTGRNBWKKAS2D4YEIZTTNUAC

hydra-queue-runner: Implement timeouts

Also, keep track of timeouts in the database as a distinct build status.

Created by Eelco Dolstra on June 17, 2015

HHOMBU7GGRAEXODSDY3WUHQGOSQ35OTGRNBWKKAS2D4YEIZTTNUAC

Dependencies

In channels

main

Change contents

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

B:BD[4.2872] → [4.2872:2925]

    const nix::Path & logDir, RemoteResult & result)

[4.2872]

[4.2925]

    const nix::Path & logDir, unsigned int maxSilentTime, unsigned int buildTimeout,
    RemoteResult & result)

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

B:BD[4.4251] → [4.4251:4352]

    writeInt(3600, to); // == maxSilentTime, FIXME
    writeInt(7200, to); // == buildTimeout, FIXME

[4.4251]

[4.4352]

    writeInt(maxSilentTime, to);
    writeInt(buildTimeout, to);
    // FIXME: send maxLogSize.

Replacement in src/hydra-queue-runner/build-remote.hh at line 21 [4.5249]

B:BD[4.5729] → [4.5729:5783]

    const nix::Path & logDir, RemoteResult & result);

[4.5729]

    const nix::Path & logDir, unsigned int maxSilentTime, unsigned int buildTimeout,
    RemoteResult & result);

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 46 [5.4840]
[5.5180]
[6.0]
```
    bsTimedOut = 7,
```
Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 55 [5.4840]
[5.5271]
[6.24]
```
    bssTimedOut = 7,
```
Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 82 [5.4840]
[7.171]
[7.171]
```
    unsigned int maxSilentTime, buildTimeout;
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 487 [5.4840]

B:BD[7.1836] → [2.0:157]

        auto res = txn.parameterized("select id, project, jobset, job, drvPath from Builds where id > $1 and finished = 0 order by id")(lastBuildId).exec();

[7.1836]

[5.9906]

        auto res = txn.parameterized("select id, project, jobset, job, drvPath, maxsilent, timeout from Builds where id > $1 and finished = 0 order by id")(lastBuildId).exec();

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 499 [5.4840]

[7.2450]

[5.10056]

            build->maxSilentTime = row["maxsilent"].as<int>();
            build->buildTimeout = row["timeout"].as<int>();
            std::cerr << build->id << " " << build->buildTimeout  << std::endl;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 984 [5.4840]

B:BD[5.15294] → [8.1843:2010]

        printMsg(lvlInfo, format("performing step ‘%1%’ on ‘%2%’ (needed by %3% builds)")
            % step->drvPath % machine->sshName % dependents.size());

[5.15294]

[7.8135]

        printMsg(lvlInfo, format("performing step ‘%1%’ on ‘%2%’ (needed by build %3% and %4% others)")
            % step->drvPath % machine->sshName % build->id % (dependents.size() - 1));

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1014 [5.4840]

B:BD[9.999] → [9.999:1108]

            buildRemote(store, machine->sshName, machine->sshKey, step->drvPath, step->drv, logDir, result);

[9.999]

[9.1108]

            /* FIXME: referring builds may have conflicting timeouts. */
            buildRemote(store, machine->sshName, machine->sshKey, step->drvPath, step->drv,
                logDir, build->maxSilentTime, build->buildTimeout, result);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1077 [5.4840]

B:BD[3.4613] → [3.4613:4703]

                result.status == RemoteResult::rrPermanentFailure ? bsFailed : bsAborted;

[3.4613]

[3.4703]

                result.status == RemoteResult::rrPermanentFailure ? bsFailed :
                result.status == RemoteResult::rrTimedOut ? bsTimedOut :
                bsAborted;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 1081 [5.4840]

B:BD[3.4749] → [3.4749:4841]

                result.status == RemoteResult::rrPermanentFailure ? bssFailed : bssAborted;

[3.4749]

[3.4841]

                result.status == RemoteResult::rrPermanentFailure ? bssFailed :
                result.status == RemoteResult::rrTimedOut ? bssTimedOut :
                bssAborted;

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 1238 [5.4840]
[4.14778]
[10.40]
```
    sleep(5);
```

Insertion in src/root/common.tt at line 207 [13.2803]

[11.688]

[12.4181]

    [% ELSIF buildstatus == 7 %]
      <img src="[% c.uri_for("/static/images/warning_${size}.png") %]" alt="Timed out" class="build-status" />

Insertion in src/root/common.tt at line 234 [13.2803]

[14.2353]

[6.924]

    [% ELSIF buildstatus == 7 %]
      <span class="error">Timed out</span>

Insertion in src/sql/hydra.sql at line 183 [16.1]
[15.19738]
[6.1015]
```
    --   7 = timed out
```