grahamc/hydra2 - Change H7CNGK4OJNRYZQGPLBGR72DULLEPFQ5UISF5J24D7IMA7SYW5LGQC

* Log evaluation errors etc. in the DB.

Created by Eelco Dolstra on November 25, 2008

H7CNGK4OJNRYZQGPLBGR72DULLEPFQ5UISF5J24D7IMA7SYW5LGQC

Dependencies

In channels

main

Change contents

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 59 [7.804]

B:BD[5.406] → [6.0:161]

∅:D[6.161] → [5.549:591]

B:BD[5.549] → [5.549:591]

        , where => "finished != 0 and timestamp = (select max(timestamp) from Builds where project == me.project and attrName == me.attrName and finished != 0)"
        , order_by => "project, attrname"

[5.406]

[5.591]

        , where => "finished != 0 and timestamp = (select max(timestamp) from Builds " .
            "where project == me.project and attrName == me.attrName and finished != 0 and system == me.system)"
        , order_by => "project, attrname, system"

Replacement in src/Hydra/lib/Hydra/Schema/Buildinputs.pm at line 39 [8.1]

B:BD[8.782] → [3.733:875]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NSUTUwG2qbvbFkZxezeSEA

[8.782]

[8.924]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:H8JAWhQt1ehZTEEPH2KGBw

Replacement in src/Hydra/lib/Hydra/Schema/Buildproducts.pm at line 36 [7.4268]

B:BD[7.4922] → [3.994:1136]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9b3ZNy73Cjat0gr5nQHIpA

[7.4922]

[7.5064]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EAo0rZSn+5Q5OY7Y1xjuyA

Replacement in src/Hydra/lib/Hydra/Schema/Buildresultinfo.pm at line 30 [5.1594]

B:BD[5.2382] → [3.1251:1393]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uTiPHxrs6S19Laa/qeb7CA

[5.2382]

[5.2524]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5R03Kdy5ujkr7s9OfCNbTA

Replacement in src/Hydra/lib/Hydra/Schema/Builds.pm at line 73 [7.5202]

B:BD[7.6194] → [3.1753:1895]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Ky0EF25kaZIaY+ofkP0ohw

[7.6194]

[5.3377]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:G1KBKGvEgnTcrgDkUnG1UQ

Replacement in src/Hydra/lib/Hydra/Schema/Buildschedulinginfo.pm at line 26 [5.3773]

B:BD[5.4473] → [3.2247:2389]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kt5gBt14ay7/DiIaQpKopA

[5.4473]

[5.4615]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MkMR6pE6mrN2BQL18ROYfA

Replacement in src/Hydra/lib/Hydra/Schema/Buildsteps.pm at line 38 [6.1675]

B:BD[6.2816] → [3.2499:2641]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ljGW5oOaJQ/uUKQx80W5SA

[6.2816]

[6.2958]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JbawGso3rboFeQMX6XfgXQ

Replacement in src/Hydra/lib/Hydra/Schema/Jobsetinputalts.pm at line 34 [9.825]

B:BD[9.1831] → [3.2717:2859]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mG0ka8XxC3ZEs/KgGKe5Hg

[9.1831]

[9.1973]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7+oJOQegjLhp5JeuCS0KPw

Replacement in src/Hydra/lib/Hydra/Schema/Jobsetinputs.pm at line 46 [10.590]

B:BD[10.1681] → [3.2993:3135]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:trcxVA3lLfgTC0TCHL3mVw

[10.1681]

[10.1823]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BCzeQkhJYieHoL4ppjdJvw

Insertion in src/Hydra/lib/Hydra/Schema/Jobsets.pm at line 20 [10.1960]
[10.2464]
[10.2464]
```
  { data_type => "text", is_nullable => 0, size => undef },
  "errormsg",
```
Insertion in src/Hydra/lib/Hydra/Schema/Jobsets.pm at line 23 [10.1960]
[10.2524]
[10.2524]
```
  "errortime",
  { data_type => "integer", is_nullable => 0, size => undef },
```

Replacement in src/Hydra/lib/Hydra/Schema/Jobsets.pm at line 51 [10.1960]

B:BD[10.2992] → [3.3352:3494]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MYl8lWfWLCIAGSulR3m5zw

[10.2992]

[10.3134]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kEcdBc9XKVhz6zO/XEkAxg

Replacement in src/Hydra/lib/Hydra/Schema/Projects.pm at line 33 [10.3266]

B:BD[10.3685] → [3.3586:3728]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tLlYQAkX5CeUR2GJir8ifg

[10.3685]

[10.3827]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:rRYzLbd9BlZAQdOjT/GQcw

Replacement in src/Hydra/lib/Hydra/Schema.pm at line 11 [7.6376]

B:BD[7.6498] → [3.3753:3895]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 11:59:19
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8AQc7Q1I5DrtSjFp722iMA

[7.6498]

[7.6640]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iYwU4nHj9C2HkHwpYlVygQ

Insertion in src/Hydra/programs/Scheduler.pl at line 6 [11.1319]
[4.492]
[11.1392]
```
use IPC::Run;
```

Insertion in src/Hydra/programs/Scheduler.pl at line 19 [11.1319]

[10.6684]


sub captureStdoutStderr {
    my $stdin = ""; my $stdout; my $stderr;
    my $res = IPC::Run::run(\@_, \$stdin, \$stdout, \$stderr);
    return ($res, $stdout, $stderr);
}

Insertion in src/Hydra/programs/Scheduler.pl at line 26 [11.1319]
[10.6685]
[12.1826]
```
    
```

Insertion in src/Hydra/programs/Scheduler.pl at line 47 [11.1319]

[13.2738]

[10.6820]

        print "copying input ", $input->name, " from $uri\n";

Deletion in src/Hydra/programs/Scheduler.pl at line 52 [11.1319]
B:BD[10.6956] → [14.0:50]
```
        print "          copied to $storePath\n";
```

Replacement in src/Hydra/programs/Scheduler.pl at line 76 [11.1319]

B:BD[14.198] → [14.198:362]

    my $drvPath = `nix-instantiate $nixExprPath --attr $jobName $extraArgs`
        or die "cannot evaluate the Nix expression containing the job definitions: $?";

[14.198]

[14.362]

    (my $res, my $drvPath, my $stderr) = captureStdoutStderr(
        "nix-instantiate", $nixExprPath, "--attr", $jobName, @{$extraArgs});
    die "cannot evaluate the Nix expression for job `$jobName':\n$stderr" unless $res;

Replacement in src/Hydra/programs/Scheduler.pl at line 81 [11.1319]

B:BD[14.383] → [14.383:698]

    # Call nix-env --xml to get info about this job (drvPath, outPath, meta attributes, ...).
    my $infoXml = `nix-env -f $nixExprPath --query --available "*" --attr-path --out-path --drv-path --meta --xml --system-filter "*" --attr $jobName $extraArgs`
        or die "cannot get information about the job: $?";

[14.383]

[14.698]

    # Call nix-env --xml to get info about this job (drvPath, outPath, meta attributes, ...). 
    ($res, my $infoXml, $stderr) = captureStdoutStderr(
        qw(nix-env --query --available * --attr-path --out-path --drv-path --meta --xml --system-filter *),
        "-f", $nixExprPath, "--attr", $jobName, @{$extraArgs});
    die "cannot get information about the job `$jobName':\n$stderr" unless $res;

Replacement in src/Hydra/programs/Scheduler.pl at line 102 [11.1319]

B:BD[15.9604] → [5.12130:12182]

            print "      already scheduled/done\n";

[15.9604]

[15.9646]

            print "already scheduled/done\n";

Replacement in src/Hydra/programs/Scheduler.pl at line 106 [11.1319]
B:BD[15.9677] → [5.12183:12224]
```
        print "      adding to queue\n";
```
[15.9677]
[15.9950]
```
        print "adding to queue\n";
```

Insertion in src/Hydra/programs/Scheduler.pl at line 145 [11.1319]

[14.1179]


sub setJobsetError {
    my ($jobset, $errorMsg) = @_;
    eval {
        $db->txn_do(sub {
            $jobset->errormsg($errorMsg);
            $jobset->errortime(time);
            $jobset->update;
        });
    };
}

Replacement in src/Hydra/programs/Scheduler.pl at line 166 [11.1319]

B:BD[16.6226] → [16.6226:6249]

        warn $@ if $@;

[16.6226]

[14.1451]

        if ($@) {
            print "error evaluating job `", $jobName, "': $@";
            setJobsetError($jobset, $@);
        }

Replacement in src/Hydra/programs/Scheduler.pl at line 174 [11.1319]

B:BD[14.1512] → [14.1512:1576]

    print "      finding alternatives for argument $argName\n";

[14.1512]

[14.1576]

    #print "finding alternatives for argument $argName\n";

Replacement in src/Hydra/programs/Scheduler.pl at line 183 [11.1319]

B:BD[14.1734] → [14.1734:1838]

            print "        INPUT ", $input->name, " (type ", $input->type, ") alt ", $alt->altnr, "\n";

[14.1734]

[14.1838]

            #print "input ", $input->name, " (type ", $input->type, ") alt ", $alt->altnr, "\n";

Replacement in src/Hydra/programs/Scheduler.pl at line 185 [11.1319]
B:BD[14.1902] → [14.1902:1932]
```
            my $newArgs = "";
```
[14.1902]
[14.1932]
```
            my @newArgs = @{$extraArgs};
```

Replacement in src/Hydra/programs/Scheduler.pl at line 187 [11.1319]

B:BD[14.1995] → [14.1995:2128]

                # !!! escaping
                $newArgs = " --arg $argName '{path = " . $inputInfo->{$argName}->{storePath} . ";}'";

[14.1995]

[14.2128]

                push @newArgs, "--arg", $argName, "{path = " . $inputInfo->{$argName}->{storePath} . ";}";

Replacement in src/Hydra/programs/Scheduler.pl at line 189 [11.1319]

B:BD[14.2192] → [14.2192:2283]

                $newArgs = " --argstr $argName '" . $inputInfo->{$argName}->{value} . "'";

[14.2192]

[14.2283]

                push @newArgs, "--argstr", $argName, $inputInfo->{$argName}->{value};

Replacement in src/Hydra/programs/Scheduler.pl at line 193 [11.1319]

B:BD[14.2392] → [14.2392:2473]

                $jobName, $jobExpr, $extraArgs . $newArgs, $argsNeeded, $n + 1);

[14.2392]

[14.2473]

                $jobName, $jobExpr, \@newArgs, $argsNeeded, $n + 1);

Insertion in src/Hydra/programs/Scheduler.pl at line 221 [11.1319]

[14.3366]

        my @newArgs = @{$extraArgs};
        push @newArgs, "--arg", $argName, "{path = " . $prevBuild->outpath . ";}";

Replacement in src/Hydra/programs/Scheduler.pl at line 226 [11.1319]

B:BD[14.3453] → [14.3453:3603]

            $jobName, $jobExpr,
            $extraArgs . " --arg $argName '{path = " . $prevBuild->outpath . ";}'",
            $argsNeeded, $n + 1);

[14.3453]

[14.3603]

            $jobName, $jobExpr, \@newArgs, $argsNeeded, $n + 1);

Replacement in src/Hydra/programs/Scheduler.pl at line 230 [11.1319]
B:BD[10.7481] → [14.3612:3617]
```
    
```
[10.7481]
[14.3617]
Insertion in src/Hydra/programs/Scheduler.pl at line 245 [11.1319]
[10.7582]
[10.7582]
```
    print "evaluating $nixExprPath\n";
```

Replacement in src/Hydra/programs/Scheduler.pl at line 248 [11.1319]

B:BD[10.7583] → [10.7583:7781]

    print "    EVALUATING $nixExprPath\n";
 
    my $jobsXml = `nix-instantiate $nixExprPath --eval-only --strict --xml`
        or die "cannot evaluate the Nix expression containing the jobs: $?";

[10.7583]

[10.7781]

    (my $res, my $jobsXml, my $stderr) = captureStdoutStderr(
        "nix-instantiate", $nixExprPath, "--eval-only", "--strict", "--xml");
    die "cannot evaluate the Nix expression containing the jobs:\n$stderr" unless $res;

Replacement in src/Hydra/programs/Scheduler.pl at line 266 [11.1319]
B:BD[10.8170] → [10.8170:8206]
```
        print "    JOB $jobName\n";
```
[10.8170]
[10.8206]
```
        print "considering job $jobName\n";
```

Replacement in src/Hydra/programs/Scheduler.pl at line 275 [11.1319]

B:BD[10.8555] → [10.8555:8609]

                print "      needs input $argName\n";

[10.8555]

[14.4438]

                #print "needs input $argName\n";

Replacement in src/Hydra/programs/Scheduler.pl at line 283 [11.1319]

B:BD[16.6352] → [16.6352:6410]

                $jobName, $jobExpr, "", \@argsNeeded, 0);

[16.6352]

[16.6410]

                $jobName, $jobExpr, [], \@argsNeeded, 0);

Replacement in src/Hydra/programs/Scheduler.pl at line 293 [11.1319]
∅:D[17.1831] → [10.9961:10009]
B:BD[10.9961] → [10.9961:10009]
```
        print "PROJECT ", $project->name, "\n";
```
[17.1831]
[10.10009]
```
        print "considering project ", $project->name, "\n";
```

Replacement in src/Hydra/programs/Scheduler.pl at line 295 [11.1319]

B:BD[10.10063] → [10.10063:10115]

            print "  JOBSET ", $jobset->name, "\n";

[10.10063]

[17.1832]

            print "considering jobset ", $jobset->name, " in ", $project->name, "\n";

Replacement in src/Hydra/programs/Scheduler.pl at line 298 [11.1319]

B:BD[17.1899] → [17.1899:1951]

            }; 
            warn $@ if $@;
       }

[17.1899]

[10.10169]

            };
            if ($@) {
                print "error evaluating jobset ", $jobset->name, ": $@";
                setProjectError($jobset, $@);
            }
        }

Deletion in src/Hydra/root/build.tt at line 4 [7.7350]
∅:D[18.1440] → [7.7398:7413]
∅:D[19.2304] → [7.7398:7413]
B:BD[7.7398] → [7.7398:7413]
```
[% USE date %]
```

Replacement in src/Hydra/root/build.tt at line 27 [7.7350]

B:BD[5.5783] → [5.5783:5852]

    <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>

[5.5783]

[20.285]

    <td>[% PROCESS renderDateTime timestamp = build.timestamp %]</td>

Replacement in src/Hydra/root/build.tt at line 89 [7.7350]

B:BD[21.28] → [5.6140:6297]

    <td>[% IF build.resultInfo.starttime %][% date.format(build.resultInfo.starttime, '%Y-%m-%d %H:%M:%S') %][% ELSE %]<em>(cached build)</em>[% END %]</td>

[21.28]

[21.97]

    <td>[% IF build.resultInfo.starttime %][% PROCESS renderDateTime timestamp = build.resultInfo.starttime %][% ELSE %]<em>(cached build)</em>[% END %]</td>

Replacement in src/Hydra/root/build.tt at line 93 [7.7350]

B:BD[21.141] → [5.6298:6453]

    <td>[% IF build.resultInfo.stoptime %][% date.format(build.resultInfo.stoptime, '%Y-%m-%d %H:%M:%S') %][% ELSE %]<em>(cached build)</em>[% END %]</td>

[21.141]

[21.209]

    <td>[% IF build.resultInfo.stoptime %][% PROCESS renderDateTime timestamp = build.resultInfo.stoptime %][% ELSE %]<em>(cached build)</em>[% END %]</td>

Replacement in src/Hydra/root/build.tt at line 350 [7.7350]

B:BD[16.4474] → [16.4474:4553]

        <td>[% date.format(input.build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>

[16.4474]

[22.714]

        <td>[% PROCESS renderDateTime timestamp = input.build.timestamp %]</td>

Insertion in src/Hydra/root/common.tt at line 10 [19.2803]

[19.3027]


[% USE date %]
[% BLOCK renderDateTime %]
  [% date.format(timestamp, '%Y-%m-%d %H:%M:%S') -%]
[% END %]

Deletion in src/Hydra/root/index.tt at line 68 [7.10713]
B:BD[7.11173] → [16.4554:4555]
Deletion in src/Hydra/root/index.tt at line 69 [7.10713]
B:BD[20.1415] → [23.3609:3627]
```
<h2>Projects</h2>
```
Deletion in src/Hydra/root/index.tt at line 70 [7.10713]
B:BD[16.4574] → [16.4574:4731]
∅:D[16.4731] → [7.11173:11174]
B:BD[7.11173] → [7.11173:11174]
B:BD[7.11174] → [20.1416:1417]
```
<ul>
  [% FOREACH project IN projects -%]
    <li><a href="[% c.uri_for('/project' project.name) %]"><tt>[% project.name %]</tt></a></li>
  [% END -%]
</ul>
```
Replacement in src/Hydra/root/layout.tt at line 122 [7.11219]
B:BD[7.11740] → [7.11740:11747]
```
</html>
```
[7.11740]
```
</html>
```

Insertion in src/Hydra/root/project.tt at line 91 [15.1667]

[24.1864]

    [% IF !edit && jobset.errormsg %]
      <tr>
        <th>Last evaluation error:</th>
        <td>
          <em>On [% PROCESS renderDateTime timestamp = jobset.errortime %]:</em>
          <pre class="multiLineMsg error">[% HTML.escape(jobset.errormsg) %]</pre>
        </td>
      </tr>
    [% END %]

Insertion in src/Hydra/root/static/css/hydra.css at line 47 [7.8691]
[7.9142]
[7.9142]
```
    vertical-align: top;
```

Insertion in src/Hydra/root/static/css/hydra.css at line 173 [7.8691]

[25.609]

[26.1971]

.multiLineMsg {
    padding: 0em;
    margin: 0em;
    white-space: pre-wrap;
}

Replacement in src/Hydra/root/static/css/logfile.css at line 89 [25.611]
B:BD[2.35] → [2.35:36]
```
}
```
[2.35]
```
}
```

Insertion in src/hydra.sql at line 173 [11.1]

[10.4981]

    errorMsg      text, -- used to signal the last evaluation error etc. for this jobset
    errorTime     integer, -- timestamp associated with errorMsg