grahamc/hydra2 - Change SSOJX6VZ5J2CKZHCBOWMIOVPOD2KLAJQBAEH74Q3EYAXXTTX625QC

hydra-queue-runner: --build-one: correctly handle a cached build

Previously, the build ID would never flow through channels which exited.

This patch tracks the buildOne state as part of State and exits avoids waiting forever for new work.

The code around buildOnly is a bit rough, making this a bit weird to implement but since it is only used for testing the value of improving it on its own is a bit questionable.

Created by Graham Christensen on March 16, 2021

SSOJX6VZ5J2CKZHCBOWMIOVPOD2KLAJQBAEH74Q3EYAXXTTX625QC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/builder.cc at line 151 [5.133]

B:BD[5.3421] → [6.4871:4942]

    bool quit = buildId == buildOne && step->drvPath == *buildDrvPath;

[5.3421]

[5.3460]

    if (!buildOneDone)
        buildOneDone = buildId == buildOne && step->drvPath == *buildDrvPath;

Replacement in src/hydra-queue-runner/builder.cc at line 269 [5.133]
∅:D[7.316] → [5.5713:5744]
B:BD[5.5713] → [5.5713:5744]
```
            if (quit) exit(1);
```
[7.316]
[8.269]
```
            if (buildOneDone) exit(1);
```

Replacement in src/hydra-queue-runner/builder.cc at line 380 [5.133]

B:BD[3.11] → [3.11:88]

        failStep(*conn, step, buildId, result, machine, stepFinished, quit);

[3.11]

[9.303]

        failStep(*conn, step, buildId, result, machine, stepFinished);

Replacement in src/hydra-queue-runner/builder.cc at line 390 [5.133]

B:BD[5.9446] → [4.450:520]

    if (quit) exit(0); // testing hack; FIXME: this won't run plugins

[5.9446]

[5.9489]

    if (buildOneDone) exit(0); // testing hack; FIXME: this won't run plugins

Replacement in src/hydra-queue-runner/builder.cc at line 402 [5.133]
B:BD[3.685] → [3.685:727]
```
    bool & stepFinished,
    bool & quit)
```
[3.685]
[3.727]
```
    bool & stepFinished)
```

Replacement in src/hydra-queue-runner/builder.cc at line 484 [5.133]

B:BD[4.4154] → [4.4154:4202]

            if (buildOne == b->id) quit = true;

[4.4154]

[4.4202]

            if (!buildOneDone && buildOne == b->id) buildOneDone = true;

Deletion in src/hydra-queue-runner/dispatcher.cc at line 377 [5.14628]
B:BD[4.6146] → [4.6146:6177]
```
            bool quit = false;
```
Replacement in src/hydra-queue-runner/dispatcher.cc at line 387 [5.14628]
B:BD[4.6527] → [4.6527:6573]
```
                nullptr, stepFinished, quit);
```
[4.6527]
[4.6573]
```
                nullptr, stepFinished);
```
Replacement in src/hydra-queue-runner/dispatcher.cc at line 389 [5.14628]
B:BD[4.6574] → [4.6574:6605]
```
            if (quit) exit(1);
```
[4.6574]
[4.6605]
```
            if (buildOneDone) exit(1);
```
Replacement in src/hydra-queue-runner/queue-monitor.cc at line 38 [5.20067]
B:BD[5.20801] → [5.20801:20820]
```
    while (true) {
```
[5.20801]
[2.0]
```
    bool quit = false;
    while (!quit) {
```
Insertion in src/hydra-queue-runner/queue-monitor.cc at line 44 [5.20067]
[5.20873]
[5.20873]
```
        if (buildOne && buildOneDone) quit = true;
```
Replacement in src/hydra-queue-runner/queue-monitor.cc at line 48 [5.20067]
B:BD[5.20964] → [10.65:85]
```
        if (done) {
```
[5.20964]
[10.85]
```
        if (done && !quit) {
```
Insertion in src/hydra-queue-runner/queue-monitor.cc at line 71 [5.20067]
[5.21508]
[5.21508]
```
    exit(0);
```

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 168 [5.20067]

[11.514]

[6.7406]

            if (!buildOneDone && build->id == buildOne) buildOneDone = true;

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 240 [5.20067]
[5.25051]
[12.7391]
```
            if (!buildOneDone && build->id == buildOne) buildOneDone = true;
```
Insertion in src/hydra-queue-runner/queue-monitor.cc at line 299 [5.20067]
[5.28622]
[5.28622]
```
        if (buildOne && newRunnable.size() == 0) buildOneDone = true;
```
Insertion in src/hydra-queue-runner/state.hh at line 370 [13.1128]
[13.6777]
[14.2499]
```
    bool buildOneDone = false;
```
Replacement in src/hydra-queue-runner/state.hh at line 489 [13.1128]
B:BD[4.7478] → [4.7478:7529]
```
        bool & stepFinished,
        bool & quit);
```
[4.7478]
[4.7529]
```
        bool & stepFinished);
```

hydra-queue-runner: --build-one: correctly handle a cached build

Dependencies

In channels

Change contents

Replacement in src/hydra-queue-runner/builder.cc at line 151 [5.133]

Replacement in src/hydra-queue-runner/builder.cc at line 269 [5.133]

Replacement in src/hydra-queue-runner/builder.cc at line 380 [5.133]

Replacement in src/hydra-queue-runner/builder.cc at line 390 [5.133]

Replacement in src/hydra-queue-runner/builder.cc at line 402 [5.133]

Replacement in src/hydra-queue-runner/builder.cc at line 484 [5.133]

Deletion in src/hydra-queue-runner/dispatcher.cc at line 377 [5.14628]

Replacement in src/hydra-queue-runner/dispatcher.cc at line 387 [5.14628]

Replacement in src/hydra-queue-runner/dispatcher.cc at line 389 [5.14628]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 38 [5.20067]

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 44 [5.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 48 [5.20067]

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 71 [5.20067]

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 168 [5.20067]

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 240 [5.20067]

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 299 [5.20067]

Insertion in src/hydra-queue-runner/state.hh at line 370 [13.1128]

Replacement in src/hydra-queue-runner/state.hh at line 489 [13.1128]