grahamc/hydra - Change HH3LID6L4WJZV6NEDVCLPCO6KF2NLUUV3VJPFNJUQZCIESK3JYSQC

Re-implement log size limits

The old queue runner already had this. However, we now store "log limit exceeded" as a separate status code in the database.

Created by Eelco Dolstra on October 6, 2015

HH3LID6L4WJZV6NEDVCLPCO6KF2NLUUV3VJPFNJUQZCIESK3JYSQC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/hydra-queue-runner/build-remote.cc at line 158 [7.85]
[5.165]
[6.79]
```
    unsigned int remoteVersion;
```
Replacement in src/hydra-queue-runner/build-remote.cc at line 161 [7.85]
B:BD[6.89] → [5.166:221]
```
        to << SERVE_MAGIC_1 << SERVE_PROTOCOL_VERSION;
```
[6.89]
[6.172]
```
        to << SERVE_MAGIC_1 << 0x202;
```

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

∅:D[8.533] → [6.379:475]

B:BD[6.379] → [6.379:475]

        unsigned int version = readInt(from);
        if (GET_PROTOCOL_MAJOR(version) != 0x200)

[8.533]

[8.534]

        remoteVersion = readInt(from);
        if (GET_PROTOCOL_MAJOR(remoteVersion) != 0x200)

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

B:BD[8.655] → [4.0:46]

        if (GET_PROTOCOL_MINOR(version) >= 1)

[8.655]

[5.268]

        if (GET_PROTOCOL_MINOR(remoteVersion) >= 1)

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

B:BD[5.919] → [5.919:1009]

        to << cmdBuildPaths << PathSet({step->drvPath}) << maxSilentTime << buildTimeout;

[5.919]

[5.1009]

        to << cmdBuildPaths << PathSet({step->drvPath});

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

B:BD[5.1018] → [3.172:268]

∅:D[3.268] → [5.1115:1150]

B:BD[5.1115] → [5.1115:1150]

        to << cmdBuildDerivation << step->drvPath << basicDrv << maxSilentTime << buildTimeout;
        // FIXME: send maxLogSize.

[5.1018]

[7.4352]

        to << cmdBuildDerivation << step->drvPath << basicDrv;
    to << maxSilentTime << buildTimeout;
    if (GET_PROTOCOL_MINOR(remoteVersion) >= 2)
        to << 64 * 1024 * 1024; // == maxLogSize

Insertion in src/hydra-queue-runner/builder.cc at line 303 [2.133]

[2.10515]

                    result.status == BuildResult::LogLimitExceeded ? bsLogLimitExceeded :

Insertion in src/hydra-queue-runner/builder.cc at line 308 [2.133]

[2.10722]

                    result.status == BuildResult::LogLimitExceeded ? bssLogLimitExceeded :

Replacement in src/hydra-queue-runner/builder.cc at line 317 [2.133]

B:BD[2.11117] → [2.11117:11177]

                    result.status == BuildResult::TimedOut)

[2.11117]

[2.11177]

                    result.status == BuildResult::TimedOut ||
                    result.status == BuildResult::LogLimitExceeded)

Insertion in src/hydra-queue-runner/state.hh at line 33 [9.1128]
[9.1731]
[9.1731]
```
    bsLogLimitExceeded = 10,
```
Insertion in src/hydra-queue-runner/state.hh at line 44 [9.1128]
[9.1867]
[9.1867]
```
    bssLogLimitExceeded = 10,
```

Insertion in src/root/build.tt at line 62 [12.7350]

[10.869]

[11.20001]

              [% ELSIF step.status == 10 %]
                <span class="error">Log limit exceeded</span>

Insertion in src/root/common.tt at line 209 [15.2803]

[13.1761]

[14.4181]

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

Insertion in src/root/common.tt at line 240 [15.2803]

[10.1014]

[16.2353]

    [% ELSIF buildstatus == 10 %]
      <span class="error">Log limit exceeded</span>

Insertion in src/sql/hydra.sql at line 198 [18.1]
[10.1052]
[17.4847]
```
    --  10 = log limit exceeded
```
Insertion in src/sql/hydra.sql at line 270 [18.1]
[10.1090]
[19.1051]
```
    --  10 = log limit exceeded
```