grahamc/hydra - Change G7KWXSFMFPFSCJ7ZD4Z6RNZSDHMHTOUDO3G6R6GYO6VDUDPMIKDQC

Distinguish build step states

The web interface now shows whether a build step is connecting, copying inputs/outputs, building, etc.

Created by Eelco Dolstra on December 7, 2017

G7KWXSFMFPFSCJ7ZD4Z6RNZSDHMHTOUDO3G6R6GYO6VDUDPMIKDQC

Dependencies

In channels

upstream

main

Change contents

Replacement in doc/dev-notes.txt at line 98 [6.1]

B:BD[6.5964] → [6.5964:6094]

  delete from builds where finished = 0 and not exists (select 1 from buildschedulinginfo s where s.id = builds.id and busy = 1);

[6.5964]

[7.94]

  delete from builds where finished = 0 and not exists (select 1 from buildschedulinginfo s where s.id = builds.id and busy != 0);

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

∅:D[3.81] → [8.0:67]

B:BD[10.274] → [8.0:67]

    RemoteResult & result, std::shared_ptr<ActiveStep> activeStep)

[3.81]

[9.2925]

    RemoteResult & result, std::shared_ptr<ActiveStep> activeStep,
    std::function<void(StepState)> updateStep)

Insertion in src/hydra-queue-runner/build-remote.cc at line 143 [9.85]
[11.10]
[9.3315]
```
        updateStep(ssConnecting);
```
Insertion in src/hydra-queue-runner/build-remote.cc at line 210 [9.85]
[11.1633]
[11.1633]
```
        updateStep(ssSendingInputs);
```
Insertion in src/hydra-queue-runner/build-remote.cc at line 268 [9.85]
[12.895]
[11.3446]
```
        updateStep(ssBuilding);
```
Insertion in src/hydra-queue-runner/build-remote.cc at line 381 [9.85]
[11.7058]
[5.198]
```
            updateStep(ssReceivingOutputs);
```

Insertion in src/hydra-queue-runner/builder.cc at line 197 [13.133]

[13.4260]


        auto updateStep = [&](StepState stepState) {
            pqxx::work txn(*conn);
            updateBuildStep(txn, buildId, stepNr, stepState);
            txn.commit();
        };

Replacement in src/hydra-queue-runner/builder.cc at line 207 [13.133]

B:BD[13.4376] → [3.934:1043]

            buildRemote(destStore, machine, step, maxSilentTime, buildTimeout, repeats, result, activeStep);

[13.4376]

[14.2415]

            buildRemote(destStore, machine, step, maxSilentTime, buildTimeout, repeats, result, activeStep, updateStep);

Replacement in src/hydra-queue-runner/builder.cc at line 222 [13.133]

B:BD[13.4608] → [14.2549:2593]

        if (result.stepStatus == bsSuccess)

[13.4608]

[15.351]

        if (result.stepStatus == bsSuccess) {
            updateStep(ssPostProcessing);

Insertion in src/hydra-queue-runner/builder.cc at line 225 [13.133]
[15.441]
[2.669]
```
        }
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 274 [17.4840]

∅:D[16.22] → [17.7878:7964]

B:BD[17.7878] → [17.7878:7964]

        ("update BuildSteps set busy = 0, status = $1, stopTime = $2 where busy = 1")

[16.22]

[18.425]

        ("update BuildSteps set busy = 0, status = $1, stopTime = $2 where busy != 0")

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 317 [17.4840]

[17.9258]

}
void State::updateBuildStep(pqxx::work & txn, BuildID buildId, unsigned int stepNr, StepState stepState)
{
    if (txn.parameterized
        ("update BuildSteps set busy = $1 where build = $2 and stepnr = $3 and busy != 0 and status is null")
        ((int) stepState)
        (buildId)
        (stepNr)
        .exec().affected_rows() != 1)
        throw Error("step %d of build %d is in an unexpected state", stepNr, buildId);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 907 [17.4840]

B:BD[19.1102] → [19.1102:1220]

                        ("update BuildSteps set busy = 0, status = $1 where build = $2 and stepnr = $3 and busy = 1")

[19.1102]

[19.1220]

                        ("update BuildSteps set busy = 0, status = $1 where build = $2 and stepnr = $3 and busy != 0")

Insertion in src/hydra-queue-runner/state.hh at line 44 [20.1128]

[20.1921]

[14.3974]

typedef enum {
    ssPreparing = 1,
    ssConnecting = 10,
    ssSendingInputs = 20,
    ssBuilding = 30,
    ssReceivingOutputs = 40,
    ssPostProcessing = 50,
} StepState;

Insertion in src/hydra-queue-runner/state.hh at line 476 [20.1128]

[20.7254]


    void updateBuildStep(pqxx::work & txn, BuildID buildId, unsigned int stepNr, StepState stepState);

Replacement in src/hydra-queue-runner/state.hh at line 533 [20.1128]

∅:D[3.2846] → [8.2341:2413]

B:BD[10.1984] → [8.2341:2413]

        RemoteResult & result, std::shared_ptr<ActiveStep> activeStep);

[3.2846]

[10.2016]

        RemoteResult & result, std::shared_ptr<ActiveStep> activeStep,
        std::function<void(StepState)> updateStep);

Replacement in src/lib/Hydra/Controller/Root.pm at line 56 [23.804]

∅:D[21.65] → [22.95:171]

B:BD[22.95] → [22.95:171]

            "select count(distinct build) from buildsteps where busy = 1");

[21.65]

[24.2622]

            "select count(distinct build) from buildsteps where busy != 0");

Replacement in src/lib/Hydra/Controller/Root.pm at line 148 [23.804]
B:BD[25.1314] → [21.122:162]
```
            { "buildsteps.busy" => 1 },
```
[25.1314]
[25.1369]
```
            { "buildsteps.busy" => { '!=', 0 } },
```

Replacement in src/lib/Hydra/Controller/Root.pm at line 196 [23.804]

B:BD[21.413] → [21.413:464]

        "where busy = 1 order by machine, stepnr",

[21.413]

[21.464]

        "where busy != 0 order by machine, stepnr",

Replacement in src/root/build.tt at line 32 [23.7350]

B:BD[26.85] → [27.5096:5236]

        [% IF ( type == "All" ) || ( type == "Failed" && step.busy == 0 && step.status != 0 ) || ( type == "Running" && step.busy == 1 ) %]

[26.85]

[28.54]

        [% IF ( type == "All" ) || ( type == "Failed" && step.busy == 0 && step.status != 0 ) || ( type == "Running" && step.busy != 0 ) %]

Replacement in src/root/build.tt at line 58 [23.7350]

B:BD[29.932] → [27.5237:5497]

            <td>[% IF step.busy == 1 || ((step.machine || step.starttime) && (step.status == 0 || step.status == 1 || step.status == 3 || step.status == 4 || step.status == 7)); INCLUDE renderMachineName machine=step.machine; ELSE; "<em>n/a</em>"; END %]</td>

[29.932]

[3.3256]

            <td>[% IF step.busy != 0 || ((step.machine || step.starttime) && (step.status == 0 || step.status == 1 || step.status == 3 || step.status == 4 || step.status == 7)); INCLUDE renderMachineName machine=step.machine; ELSE; "<em>n/a</em>"; END %]</td>

Replacement in src/root/build.tt at line 60 [23.7350]

∅:D[3.3293] → [29.1002:1082]

B:BD[29.1002] → [29.1002:1082]

              [% IF step.busy == 1 %]
                <strong>Building</strong>

[3.3293]

[29.1082]

              [% IF step.busy != 0 %]
                [% IF step.busy == 1 %]
                  <strong>Preparing</strong>
                [% ELSIF step.busy == 10 %]
                  <strong>Connecting</strong>
                [% ELSIF step.busy == 20 %]
                  <strong>Sending inputs</strong>
                [% ELSIF step.busy == 30 %]
                  <strong>Building</strong>
                [% ELSIF step.busy == 40 %]
                  <strong>Receiving outputs</strong>
                [% ELSIF step.busy == 50 %]
                  <strong>Post-processing</strong>
                [% ELSE %]
                  <strong>Unknown state</strong>
                [% END %]

Replacement in src/root/machine-status.tt at line 45 [30.8348]

B:BD[21.788] → [4.3805:3940]

            <td><a class="row-link" href="[% c.uri_for('/build' step.build 'nixlog' step.stepnr 'tail') %]">[% step.stepnr %]</a></td>

[21.788]

[31.1149]

            <td>[% IF step.busy >= 30 %]<a class="row-link" href="[% c.uri_for('/build' step.build 'nixlog' step.stepnr 'tail') %]">[% step.stepnr %]</a>[% ELSE; step.stepnr; END %]</td>

Insertion in src/sql/hydra.sql at line 275 [33.1]

[32.7341]

[32.7366]

    -- 0 = not busy
    -- 1 = building
    -- 2 = preparing to build
    -- 3 = connecting
    -- 4 = sending inputs
    -- 5 = receiving outputs
    -- 6 = analysing build result

Replacement in src/sql/hydra.sql at line 658 [33.1]

B:BD[34.2384] → [35.0:71]

create index IndexBuildStepsOnBusy on BuildSteps(busy) where busy = 1;

[34.2384]

[35.71]

create index IndexBuildStepsOnBusy on BuildSteps(busy) where busy != 0;

File addition: upgrade-56.sql (----------)

[36.3004]

drop index IndexBuildStepsOnBusy;
create index IndexBuildStepsOnBusy on BuildSteps(busy) where busy != 0;