grahamc/hydra - Change TPNHTE5VJ36IPKMFENDERDBFBHLYFXOVNDLV2QSC4G5STPPMBLMAC

Remove obsolete Builds columns and provide accurate "Running builds"

This removes the "busy", "locker" and "logfile" columns, which are no longer used by the queue runner. The "Running builds" page now only shows builds that have an active build step.

Created by Eelco Dolstra on October 27, 2015

TPNHTE5VJ36IPKMFENDERDBFBHLYFXOVNDLV2QSC4G5STPPMBLMAC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/hydra-queue-runner/builder.cc at line 113 [11.133]
B:BD[11.3922] → [11.3922:3985]
```
           building. Also, mark the selected build as busy. */
```
[11.3922]
[11.3985]
```
           building. */
```

Deletion in src/hydra-queue-runner/builder.cc at line 117 [11.133]

B:BD[11.4131] → [11.4131:4224]

            txn.parameterized("update Builds set busy = 1 where id = $1")(build->id).exec();

Replacement in src/hydra-queue-runner/builder.cc at line 343 [11.133]

B:BD[11.12527] → [11.12527:12696]

                        ("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5 where id = $1 and finished = 0")

[11.12527]

[11.12696]

                        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5 where id = $1 and finished = 0")

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 162 [14.4840]
B:BD[12.92] → [13.178:254]
```
    txn.exec("update Builds set busy = 0 where finished = 0 and busy = 1");
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 311 [14.4840]

B:BD[12.600] → [8.0:183]

        ("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $4, size = $5, closureSize = $6, releaseName = $7, isCachedBuild = $8 where id = $1")

[12.600]

[14.18032]

        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, size = $5, closureSize = $6, releaseName = $7, isCachedBuild = $8 where id = $1")

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 128 [11.20067]

B:BD[11.23444] → [11.23444:23604]

                    ("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $3, errorMsg = $4 where id = $1 and finished = 0")

[11.23444]

[11.23604]

                    ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3, errorMsg = $4 where id = $1 and finished = 0")

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 204 [11.20067]

B:BD[11.26686] → [9.213:381]

                        ("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $3, isCachedBuild = 1 where id = $1 and finished = 0")

[11.26686]

[11.26855]

                        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3, isCachedBuild = 1 where id = $1 and finished = 0")

Deletion in src/lib/Hydra/Controller/API.pm at line 41 [15.24]
B:BD[15.1427] → [15.1427:1483]
```
        $result->{'busy'} = $build->get_column("busy");
```

Replacement in src/lib/Hydra/Controller/API.pm at line 116 [15.24]

B:BD[15.3740] → [16.303:435]

    my @builds = $c->model('DB::Builds')->search({finished => 0}, {rows => $nr, order_by => ["busy DESC", "priority DESC", "id"]});

[15.3740]

[17.1356]

    my @builds = $c->model('DB::Builds')->search({finished => 0}, {rows => $nr, order_by => ["priority DESC", "id"]});

Deletion in src/lib/Hydra/Controller/API.pm at line 133 [15.24]

∅:D[18.35] → [15.4459:4508]

∅:D[19.324] → [15.4459:4508]

B:BD[15.4459] → [15.4459:4508]

B:BD[15.4508] → [20.1486:1487]

∅:D[20.1487] → [15.4508:4596]

B:BD[15.4508] → [15.4508:4596]

B:BD[15.4596] → [19.325:486]

    };
    $c->forward('Hydra::View::Plain');
}
sub nrrunning : Chained('api') PathPart('nrrunning') Args(0) {
    my ($self, $c) = @_;
    my $nrRunningBuilds = $c->model('DB::Builds')->search({finished => 0, busy => 1 })->count();
    $c->stash->{'plain'} = {
        data => "$nrRunningBuilds"

Deletion in src/lib/Hydra/Controller/API.pm at line 204 [15.24]

B:BD[21.153] → [21.153:198]

B:BD[21.198] → [20.2705:2781]

∅:D[20.2781] → [22.150:173]

B:BD[22.150] → [22.150:173]

∅:D[22.173] → [15.6138:6139]

∅:D[21.230] → [15.6138:6139]

B:BD[15.6138] → [15.6138:6139]

B:BD[15.6139] → [21.231:418]

B:BD[21.418] → [20.2782:2783]

∅:D[20.2783] → [21.418:806]

B:BD[21.418] → [21.418:806]

B:BD[21.806] → [20.2784:2958]

∅:D[20.2958] → [21.1028:1127]

B:BD[21.1028] → [21.1028:1127]

B:BD[21.1127] → [2.0:48]

∅:D[2.48] → [21.1127:1228]

B:BD[21.1127] → [21.1127:1228]

B:BD[21.1228] → [23.239:243]

sub readNormalizedLog {
    my ($file) = @_;
    my $pipe = (-f "$file.bz2" ? "cat $file.bz2 | bzip2 -d" : "cat $file");
    my $res = `$pipe`;
    $res =~ s/\/nix\/store\/[a-z0-9]*-/\/nix\/store\/...-/g;
    $res =~ s/nix-build-[a-z0-9]*-/nix-build-...-/g;
    $res =~ s/[0-9]{2}:[0-9]{2}:[0-9]{2}/00:00:00/g;
    return $res;
}
sub logdiff : Chained('api') PathPart('logdiff') Args(2) {
    my ($self, $c, $buildid1, $buildid2) = @_;
    my $diff = "";
    my $build1 = getBuild($c, $buildid1);
    notFound($c, "Build with ID $buildid1 doesn't exist.")
        if !defined $build1;
    my $build2 = getBuild($c, $buildid2);
    notFound($c, "Build with ID $buildid2 doesn't exist.")
        if !defined $build2;
    if (-f $build1->logfile && -f $build2->logfile) {
        my $logtext1 = readNormalizedLog($build1->logfile);
        my $logtext2 = readNormalizedLog($build2->logfile);
        $diff = diff \$logtext1, \$logtext2;
    } else {
        $c->response->status(404);
    }
    $c->response->content_type('text/x-diff');
    $c->stash->{'plain'} = { data => (scalar $diff) || " " };
    $c->forward('Hydra::View::Plain');
}

Replacement in src/lib/Hydra/Controller/Build.pm at line 170 [25.1]

B:BD[24.156] → [19.1433:1522]

        $c->stash->{reload} = !$c->stash->{build}->finished && $c->stash->{build}->busy;

[24.156]

[24.274]

        $c->stash->{reload} = !$c->stash->{build}->finished;

Replacement in src/lib/Hydra/Controller/Root.pm at line 47 [28.804]

B:BD[26.54] → [27.2507:2622]

        $c->stash->{nrRunningBuilds} = $c->model('DB::Builds')->search({ finished => 0, busy => 1 }, {})->count();

[26.54]

[27.2622]

        $c->stash->{nrRunningBuilds} = $c->model('DB::Builds')->search(
            { finished => 0, 'buildsteps.busy' => 1 },
            { join => 'buildsteps', select => ["id"], distinct => 1 })->count();

Replacement in src/lib/Hydra/Controller/Root.pm at line 94 [28.804]

B:BD[29.22015] → [30.2834:2949]

        entity => [$c->model('DB::Builds')->search({finished => 0}, { order_by => ["globalpriority desc", "id"]})]

[29.22015]

[29.22247]

        entity => [$c->model('DB::Builds')->search(
            { finished => 0 },
            { order_by => ["globalpriority desc", "id"],
            , columns => [@buildListColumns]
            })]

Replacement in src/lib/Hydra/Controller/Root.pm at line 109 [28.804]

B:BD[29.22362] → [5.0:120]

        entity => [$c->model('DB::Builds')->search({finished => 0, busy => 1}, { order_by => ["priority DESC", "id"]})]

[29.22362]

[29.23091]

        entity => [$c->model('DB::Builds')->search(
            { finished => 0, "buildsteps.busy" => 1 },
            { order_by => ["globalpriority DESC", "id"],
              join => "buildsteps",
              columns => [@buildListColumns]
            })]

Replacement in src/lib/Hydra/Controller/Root.pm at line 140 [28.804]

B:BD[31.480] → [31.480:543]

        { finished => 0, 'me.busy' => 1, 'build.busy' => 1, },

[31.480]

[31.543]

        { finished => 0, 'me.busy' => 1, },

Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 453 [33.2663]
∅:D[32.2478] → [27.4587:4638]
∅:D[14.19689] → [27.4587:4638]
B:BD[27.4587] → [27.4587:4638]
```
            , busy => 0
            , locker => ""
```

Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 32 [25.3469]

B:BD[34.634] → [16.1148:1326]

Readonly our @buildListColumns => ('id', 'finished', 'timestamp', 'stoptime', 'project', 'jobset', 'job', 'nixname', 'system', 'priority', 'busy', 'buildstatus', 'releasename');

[34.634]

[25.3595]

Readonly our @buildListColumns => ('id', 'finished', 'timestamp', 'stoptime', 'project', 'jobset', 'job', 'nixname', 'system', 'buildstatus', 'releasename');

Deletion in src/lib/Hydra/Helper/Nix.pm at line 458 [35.436]
B:BD[4.173] → [4.173:224]
```
            , busy => 0
            , locker => ""
```
Replacement in src/lib/Hydra/Schema/Builds.pm at line 123 [28.5202]
∅:D[10.210] → [36.8491:8508]
∅:D[37.545] → [36.8491:8508]
B:BD[36.8491] → [36.8491:8508]
```
  is_nullable: 1
```
[10.210]
[36.8522]
```
  is_nullable: 0
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 148 [28.5202]
∅:D[30.3033] → [19.4273:4346]
B:BD[19.4273] → [19.4273:4346]
```
  data_type: 'integer'
  default_value: 0
  is_nullable: 0
=head2 busy
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 152 [28.5202]
B:BD[19.4406] → [19.4406:4475]
```
=head2 locker
  data_type: 'text'
  is_nullable: 1
=head2 logfile
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 153 [28.5202]
B:BD[36.8727] → [38.8010:8030]
∅:D[38.8030] → [36.8768:8785]
B:BD[36.8768] → [36.8768:8785]
B:BD[19.4553] → [19.4553:4554]
```
  data_type: 'text'
  is_nullable: 1
```

Replacement in src/lib/Hydra/Schema/Builds.pm at line 233 [28.5202]

B:BD[10.226] → [10.226:294]

  { data_type => "integer", default_value => 0, is_nullable => 1 },

[10.226]

[39.851]

  { data_type => "integer", default_value => 0, is_nullable => 0 },

Deletion in src/lib/Hydra/Schema/Builds.pm at line 243 [28.5202]
∅:D[30.3122] → [19.4673:4751]
B:BD[19.4673] → [19.4673:4751]
```
  { data_type => "integer", default_value => 0, is_nullable => 0 },
  "busy",
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 244 [28.5202]
B:BD[19.4819] → [19.4819:4831]
∅:D[19.4831] → [38.9077:9122]
B:BD[40.240] → [38.9077:9122]
B:BD[38.9122] → [19.4832:4890]
```
  "locker",
  { data_type => "text", is_nullable => 1 },
  "logfile",
  { data_type => "text", is_nullable => 1 },
```

Replacement in src/lib/Hydra/Schema/Builds.pm at line 547 [28.5202]

B:BD[41.3378] → [10.295:437]

# Created by DBIx::Class::Schema::Loader v0.07043 @ 2015-09-10 17:34:23
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JRelp13Cyfi+QVxC92xuqQ

[41.3378]

[42.4481]

# Created by DBIx::Class::Schema::Loader v0.07043 @ 2015-10-27 13:54:16
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iN9vwO5i3dURKOTgaPTHxw

Deletion in src/lib/Hydra/Schema/Builds.pm at line 628 [28.5202]
B:BD[43.606] → [43.606:622]
```
        'busy',
```

Replacement in src/root/build.tt at line 7 [28.7350]

B:BD[44.6589] → [3.0:42]

[% isAggregate = constituents.size > 0 %]

[45.3466]

[46.11433]

[%
isAggregate = constituents.size > 0;
steps = build.buildsteps;
busy = 0;
FOR step IN steps; IF step.busy; busy = 1; END; END;
%]

Replacement in src/root/build.tt at line 26 [28.7350]

B:BD[46.11774] → [7.0:53]

      [% FOREACH step IN build.buildsteps.reverse %]

[46.11774]

[46.11819]

      [% FOREACH step IN steps.reverse %]

Replacement in src/root/build.tt at line 122 [28.7350]

∅:D[47.68] → [48.1862:1968]

B:BD[48.1862] → [48.1862:1968]

  [% IF build.buildsteps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]

[47.68]

[48.1968]

  [% IF steps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]

Replacement in src/root/build.tt at line 146 [28.7350]

B:BD[49.168] → [49.168:230]

                [% INCLUDE renderStatus build=build icon=0 %]

[49.168]

[49.230]

                [% INCLUDE renderStatus build=build icon=0 busy=busy %]

Replacement in src/root/build.tt at line 237 [28.7350]
B:BD[50.1107] → [48.4947:4971]
```
    [% IF build.busy %]
```
[50.1107]
[48.4971]
```
    [% IF busy %]
```

Replacement in src/root/build.tt at line 244 [28.7350]

∅:D[47.70] → [48.5101:5185]

B:BD[48.5101] → [48.5101:5185]

      [% IF build.buildsteps && build.buildstatus != 0 && build.buildstatus != 6 %]

[47.70]

[48.5185]

      [% IF steps && build.buildstatus != 0 && build.buildstatus != 6 %]

Replacement in src/root/build.tt at line 431 [28.7350]
B:BD[51.4688] → [48.12299:12327]
```
  [% IF build.buildsteps %]
```
[51.4688]
[48.12327]
```
  [% IF steps %]
```

Replacement in src/root/common.tt at line 101 [53.2803]

B:BD[52.1876] → [52.1876:1994]

          [% INCLUDE renderBuildStatusIcon size=16 busy=(showSchedulingInfo ? 1 : 0) buildstatus=build.buildstatus %]

[52.1876]

[52.1994]

          [% INCLUDE renderBuildStatusIcon size=16 buildstatus=build.buildstatus %]

Replacement in src/root/common.tt at line 105 [53.2803]

B:BD[52.2058] → [52.2058:2195]

        <td>[% IF build.busy %]<span class="label label-success">Started</span>[% ELSE %]<span class="label">Queued</span>[% END %]</td>

[52.2058]

[52.2195]

        <td>[% IF busy %]<span class="label label-success">Started</span>[% ELSE %]<span class="label">Queued</span>[% END %]</td>

Deletion in src/root/common.tt at line 192 [53.2803]
B:BD[52.4403] → [52.4403:4447]
```
  busy = busy != undef ? busy : build.busy;
```

Replacement in src/root/common.tt at line 213 [53.2803]

B:BD[52.4574] → [52.4574:4590]

B:BD[52.4590] → [54.796:897]

∅:D[54.897] → [55.4231:4244]

∅:D[56.1069] → [55.4231:4244]

B:BD[57.1075] → [55.4231:4244]

B:BD[55.4244] → [54.898:1004]

  ELSIF busy %]
    <img src="[% c.uri_for("/static/images/help_${size}.png") %]" alt="Busy" class="build-status" />
  [% ELSE %]
    <img src="[% c.uri_for("/static/images/help_${size}.png") %]" alt="Scheduled" class="build-status" />

[52.4574]

[52.4591]

  ELSE %]
    <img src="[% c.uri_for("/static/images/help_${size}.png") %]" alt="Queued" class="build-status" />

Replacement in src/root/common.tt at line 243 [53.2803]
B:BD[52.4783] → [52.4783:4805]
∅:D[52.4805] → [57.2850:2889]
∅:D[19.6385] → [57.2850:2889]
B:BD[57.2850] → [57.2850:2889]
B:BD[57.2889] → [52.4806:4871]
```
  ELSIF build.busy %]
    <strong>Build in progress</strong>
    since [% INCLUDE renderDateTime timestamp = build.starttime;
```
[52.4783]
[52.4871]
```
  ELSIF busy %]
    <strong>Build in progress</strong>[%-
```

Replacement in src/root/jobset-eval.tt at line 94 [59.4844]

B:BD[58.1456] → [58.1456:1501]

       hideProjectName=1 hideJobsetName=1 %]

[58.1456]

[58.1501]

       hideProjectName=1 hideJobsetName=1 busy=0 %]

Replacement in src/root/status.tt at line 10 [60.1151]

B:BD[60.1222] → [5.376:462]

  [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 %]

[60.1222]

[5.462]

  [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 busy=1 %]

Deletion in src/sql/hydra.sql at line 175 [61.1]
∅:D[30.3588] → [41.9515:9516]
B:BD[41.9515] → [41.9515:9516]
B:BD[41.9516] → [14.20177:20235]
∅:D[14.20235] → [41.9516:9609]
B:BD[41.9516] → [41.9516:9609]
B:BD[41.9609] → [19.7741:7819]
```
    -- FIXME: remove (obsolete with the new queue runner)
    busy          integer not null default 0, -- true means someone is building this job now
    locker        text, -- !!! hostname/pid of the process building this job?
```
Deletion in src/sql/hydra.sql at line 176 [61.1]
B:BD[41.9708] → [41.9708:9768]
B:BD[19.7881] → [17.37615:37616]
```
    logfile       text, -- if busy, the path of the logfile
```

Deletion in src/sql/hydra.sql at line 638 [61.1]

B:BD[6.209] → [6.209:294]

create index IndexBuildsOnFinishedBusy on Builds(finished, busy) where finished = 0;

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

[62.3004]

alter table Builds drop column busy, drop column locker, drop column logfile;
drop index IndexBuildsOnFinishedBusy;

Remove obsolete Builds columns and provide accurate "Running builds"

Dependencies

In channels

Change contents

Replacement in src/hydra-queue-runner/builder.cc at line 113 [11.133]

Deletion in src/hydra-queue-runner/builder.cc at line 117 [11.133]

Replacement in src/hydra-queue-runner/builder.cc at line 343 [11.133]

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 162 [14.4840]

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 311 [14.4840]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 128 [11.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 204 [11.20067]

Deletion in src/lib/Hydra/Controller/API.pm at line 41 [15.24]

Replacement in src/lib/Hydra/Controller/API.pm at line 116 [15.24]

Deletion in src/lib/Hydra/Controller/API.pm at line 133 [15.24]

Deletion in src/lib/Hydra/Controller/API.pm at line 204 [15.24]

Replacement in src/lib/Hydra/Controller/Build.pm at line 170 [25.1]

Replacement in src/lib/Hydra/Controller/Root.pm at line 47 [28.804]

Replacement in src/lib/Hydra/Controller/Root.pm at line 94 [28.804]

Replacement in src/lib/Hydra/Controller/Root.pm at line 109 [28.804]

Replacement in src/lib/Hydra/Controller/Root.pm at line 140 [28.804]

Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 453 [33.2663]

Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 32 [25.3469]

Deletion in src/lib/Hydra/Helper/Nix.pm at line 458 [35.436]

Replacement in src/lib/Hydra/Schema/Builds.pm at line 123 [28.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 148 [28.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 152 [28.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 153 [28.5202]

Replacement in src/lib/Hydra/Schema/Builds.pm at line 233 [28.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 243 [28.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 244 [28.5202]

Replacement in src/lib/Hydra/Schema/Builds.pm at line 547 [28.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 628 [28.5202]

Replacement in src/root/build.tt at line 7 [28.7350]

Replacement in src/root/build.tt at line 26 [28.7350]

Replacement in src/root/build.tt at line 122 [28.7350]

Replacement in src/root/build.tt at line 146 [28.7350]

Replacement in src/root/build.tt at line 237 [28.7350]

Replacement in src/root/build.tt at line 244 [28.7350]

Replacement in src/root/build.tt at line 431 [28.7350]

Replacement in src/root/common.tt at line 101 [53.2803]

Replacement in src/root/common.tt at line 105 [53.2803]

Deletion in src/root/common.tt at line 192 [53.2803]

Replacement in src/root/common.tt at line 213 [53.2803]

Replacement in src/root/common.tt at line 243 [53.2803]

Replacement in src/root/jobset-eval.tt at line 94 [59.4844]

Replacement in src/root/status.tt at line 10 [60.1151]

Deletion in src/sql/hydra.sql at line 175 [61.1]

Deletion in src/sql/hydra.sql at line 176 [61.1]

Deletion in src/sql/hydra.sql at line 638 [61.1]

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