- [% IF build.buildstatus == 0 %]
+ [% IF build.resultInfo.buildstatus == 0 %]
[% ELSE %]
diff --git a/src/build.pl b/src/build.pl
index d449f71a..b35e7aa5 100644
--- a/src/build.pl
+++ b/src/build.pl
@@ -16,11 +16,11 @@ sub isValidPath {
}
-sub buildJob {
- my ($job) = @_;
+sub doBuild {
+ my ($build) = @_;
- my $drvPath = $job->drvpath;
- my $outPath = $job->outpath;
+ my $drvPath = $build->drvpath;
+ my $outPath = $build->outpath;
my $isCachedBuild = 1;
my $outputCreated = 1; # i.e., the Nix build succeeded (but it could be a positive failure)
@@ -52,27 +52,17 @@ sub buildJob {
}
$db->txn_do(sub {
- my $build = $db->resultset('Builds')->create(
- { timestamp => time()
- , project => $job->project->name
- , jobset => $job->jobset->name
- , attrname => $job->attrname
- , description => $job->description
- , drvpath => $drvPath
- , outpath => $outPath
+ $build->finished(1);
+ $build->timestamp(time());
+ $build->update;
+
+ $db->resultset('Buildresultinfo')->create(
+ { id => $build->id
, iscachedbuild => $isCachedBuild
, buildstatus => $buildStatus
, starttime => $startTime
, stoptime => $stopTime
- , system => $job->system
});
- print " build ID = ", $build->id, "\n";
-
- foreach my $input ($job->inputs) {
- $input->job(undef);
- $input->build($build->id);
- $input->update;
- }
my $logPath = "/nix/var/log/nix/drvs/" . basename $drvPath;
if (-e $logPath) {
@@ -125,47 +115,44 @@ sub buildJob {
}
}
- $job->delete;
-
+ $build->schedulingInfo->delete;
});
-
- print "STOP ", time, "\n";
}
-my $jobId = $ARGV[0] or die;
-print "building job $jobId\n";
+my $buildId = $ARGV[0] or die;
+print "performing build $buildId\n";
-# Lock the job. If necessary, steal the lock from the parent process
-# (runner.pl). This is so that if the runner dies, the children
-# (i.e. the job builders) can continue to run and won't have the lock
-# taken away.
-my $job;
+# Lock the build. If necessary, steal the lock from the parent
+# process (runner.pl). This is so that if the runner dies, the
+# children (i.e. the build.pl instances) can continue to run and won't
+# have the lock taken away.
+my $build;
$db->txn_do(sub {
- ($job) = $db->resultset('Jobs')->search({ id => $jobId });
- die "job $jobId doesn't exist" unless defined $job;
- if ($job->busy != 0 && $job->locker != getppid) {
- die "job $jobId is already being built";
+ ($build) = $db->resultset('Builds')->search({id => $buildId});
+ die "build $buildId doesn't exist" unless defined $build;
+ if ($build->schedulingInfo->busy != 0 && $build->schedulingInfo->locker != getppid) {
+ die "build $buildId is already being built";
}
- $job->busy(1);
- $job->locker($$);
- $job->update;
+ $build->schedulingInfo->busy(1);
+ $build->schedulingInfo->locker($$);
+ $build->schedulingInfo->update;
});
-die unless $job;
+die unless $build;
-# Build the job. If it throws an error, unlock the job so that it can
-# be retried.
+# Do the build. If it throws an error, unlock the build so that it
+# can be retried.
eval {
print "BUILD\n";
- buildJob $job;
+ doBuild $build;
print "DONE\n";
};
if ($@) {
warn $@;
$db->txn_do(sub {
- $job->busy(0);
- $job->locker($$);
- $job->update;
+ $build->schedulingInfo->busy(0);
+ $build->schedulingInfo->locker($$);
+ $build->schedulingInfo->update;
});
}
diff --git a/src/hydra.sql b/src/hydra.sql
index ab9e9bb5..bd3b6d7c 100644
--- a/src/hydra.sql
+++ b/src/hydra.sql
@@ -1,6 +1,15 @@
-create table builds (
+-- This table contains all builds, either scheduled or finished. For
+-- scheduled builds, additional info (such as the priority) can be
+-- found in the BuildSchedulingInfo table. For finished builds,
+-- additional info (such as the logs, build products, etc.) can be
+-- found in several tables, such as BuildResultInfo, BuildLogs and
+-- BuildProducts.
+create table Builds (
id integer primary key autoincrement not null,
- timestamp integer not null, -- time this build was added to the db (in Unix time)
+
+ finished integer not null, -- 0 = scheduled, 1 = finished
+
+ timestamp integer not null, -- time this build was scheduled / finished building
-- Info about the inputs.
project text not null, -- !!! foreign key
@@ -11,25 +20,51 @@ create table builds (
description text,
drvPath text not null,
outPath text not null,
- isCachedBuild integer not null, -- boolean
- buildStatus integer, -- 0 = succeeded, 1 = Nix build failure, 2 = positive build failure
- errorMsg text, -- error message in case of a Nix failure
- startTime integer, -- in Unix time, 0 = used cached build result
- stopTime integer,
system text not null,
-
- foreign key (project) references projects(name), -- ignored by sqlite
- foreign key (project, jobset) references jobsets(project, name) -- ignored by sqlite
+
+ foreign key (project) references Projects(name), -- ignored by sqlite
+ foreign key (project, jobset) references Jobsets(project, name) -- ignored by sqlite
);
--- Inputs of jobs/builds.
-create table inputs (
+-- Info for a scheduled build.
+create table BuildSchedulingInfo (
+ id integer primary key not null,
+
+ priority integer not null default 0,
+
+ busy integer not null default 0, -- true means someone is building this job now
+ locker text not null default '', -- !!! hostname/pid of the process building this job?
+
+ logfile text, -- if busy, the path of the logfile
+
+ foreign key (id) references Builds(id) on delete cascade -- ignored by sqlite
+);
+
+
+-- Info for a finished build.
+create table BuildResultInfo (
+ id integer primary key not null,
+
+ isCachedBuild integer not null, -- boolean
+
+ buildStatus integer, -- 0 = succeeded, 1 = Nix build failure, 2 = positive build failure
+
+ errorMsg text, -- error message in case of a Nix failure
+
+ startTime integer, -- in Unix time, 0 = used cached build result
+ stopTime integer,
+
+ foreign key (id) references Builds(id) on delete cascade -- ignored by sqlite
+);
+
+
+-- Inputs of builds.
+create table BuildInputs (
id integer primary key autoincrement not null,
- -- Which job or build this input belongs to. Exactly one must be non-null.
+ -- Which build this input belongs to.
build integer,
- job integer,
-- Copied from the jobsetinputs from which the build was created.
name text not null,
@@ -42,29 +77,28 @@ create table inputs (
path text,
- foreign key (build) references builds(id) -- ignored by sqlite
- foreign key (job) references jobs(id) -- ignored by sqlite
- foreign key (dependency) references builds(id) -- ignored by sqlite
+ foreign key (build) references Builds(id) on delete cascade, -- ignored by sqlite
+ foreign key (dependency) references Builds(id) -- ignored by sqlite
);
-create table buildProducts (
+create table BuildProducts (
build integer not null,
path text not null,
type text not null, -- "nix-build", "file", "doc", "report", ...
subtype text not null, -- "source-dist", "rpm", ...
primary key (build, path),
- foreign key (build) references builds(id) on delete cascade -- ignored by sqlite
+ foreign key (build) references Builds(id) on delete cascade -- ignored by sqlite
);
-create table buildLogs (
+create table BuildLogs (
build integer not null,
logPhase text not null,
path text not null,
type text not null,
primary key (build, logPhase),
- foreign key (build) references builds(id) on delete cascade -- ignored by sqlite
+ foreign key (build) references Builds(id) on delete cascade -- ignored by sqlite
);
@@ -72,13 +106,15 @@ create table buildLogs (
create trigger cascadeBuildDeletion
before delete on builds
for each row begin
- --delete from buildInputs where build = old.id;
- delete from buildLogs where build = old.id;
- delete from buildProducts where build = old.id;
+ delete from BuildSchedulingInfo where id = old.id;
+ delete from BuildResultInfo where id = old.id;
+ delete from BuildInputs where build = old.id;
+ delete from BuildLogs where build = old.id;
+ delete from BuildProducts where build = old.id;
end;
-create table projects (
+create table Projects (
name text primary key not null
);
@@ -86,29 +122,29 @@ create table projects (
-- A jobset consists of a set of inputs (e.g. SVN repositories), one
-- of which contains a Nix expression containing an attribute set
-- describing build jobs.
-create table jobsets (
+create table Jobsets (
name text not null,
project text not null,
description text,
nixExprInput text not null, -- name of the jobsetInput containing the Nix expression
nixExprPath text not null, -- relative path of the Nix expression
primary key (project, name),
- foreign key (project) references projects(name) on delete cascade, -- ignored by sqlite
- foreign key (project, name, nixExprInput) references jobsetInputs(project, job, name)
+ foreign key (project) references Projects(name) on delete cascade, -- ignored by sqlite
+ foreign key (project, name, nixExprInput) references JobsetInputs(project, job, name)
);
-create table jobsetInputs (
+create table JobsetInputs (
project text not null,
jobset text not null,
name text not null,
type text not null, -- "svn", "cvs", "path", "file", "string"
primary key (project, jobset, name),
- foreign key (project, jobset) references jobsets(project, name) on delete cascade -- ignored by sqlite
+ foreign key (project, jobset) references Jobsets(project, name) on delete cascade -- ignored by sqlite
);
-create table jobsetInputAlts (
+create table JobsetInputAlts (
project text not null,
jobset text not null,
input text not null,
@@ -121,30 +157,5 @@ create table jobsetInputAlts (
value text, -- for type == 'string'
primary key (project, jobset, input, altnr),
- foreign key (project, jobset, input) references jobsetInputs(project, jobset, name) on delete cascade -- ignored by sqlite
-);
-
-
-create table jobs (
- id integer primary key autoincrement not null,
- timestamp integer not null, -- time this build was added to the db (in Unix time)
-
- priority integer not null default 0,
-
- busy integer not null default 0, -- true means someone is building this job now
- locker text not null default '', -- !!! hostname/pid of the process building this job?
-
- -- Info about the inputs.
- project text not null, -- !!! foreign key
- jobset text not null, -- !!! foreign key
- attrName text not null,
-
- -- What this job will build.
- description text,
- drvPath text not null,
- outPath text not null,
- system text not null,
-
- foreign key (project) references projects(name), -- ignored by sqlite
- foreign key (project, jobset) references jobsets(project, name) -- ignored by sqlite
+ foreign key (project, jobset, input) references JobsetInputs(project, jobset, name) on delete cascade -- ignored by sqlite
);
diff --git a/src/runner.pl b/src/runner.pl
index 7889eb74..8d45721a 100644
--- a/src/runner.pl
+++ b/src/runner.pl
@@ -12,14 +12,16 @@ $db->storage->dbh->do("PRAGMA synchronous = OFF;");
# Unlock jobs whose building process has died.
$db->txn_do(sub {
- my @jobs = $db->resultset('Jobs')->search({ busy => 1 });
+ my @jobs = $db->resultset('Builds')->search(
+ {finished => 0, busy => 1}, {join => 'schedulingInfo'});
foreach my $job (@jobs) {
- my $pid = $job->locker;
+ print $job, "\n";
+ my $pid = $job->schedulingInfo->locker;
if (kill(0, $pid) != 1) { # see if we can signal the process
print "job ", $job->id, " pid $pid died, unlocking\n";
- $job->busy(0);
- $job->locker("");
- $job->update;
+ $job->schedulingInfo->busy(0);
+ $job->schedulingInfo->locker("");
+ $job->schedulingInfo->update;
}
}
});
@@ -32,15 +34,17 @@ sub checkJobs {
$db->txn_do(sub {
- my @jobs = $db->resultset('Jobs')->search({ busy => 0 }, {order_by => ["priority", "timestamp"]});
+ my @jobs = $db->resultset('Builds')->search(
+ {finished => 0, busy => 0},
+ {join => 'schedulingInfo', order_by => ["priority", "timestamp"]});
print "# of available jobs: ", scalar(@jobs), "\n";
if (scalar @jobs > 0) {
$job = $jobs[0];
- $job->busy(1);
- $job->locker($$);
- $job->update;
+ $job->schedulingInfo->busy(1);
+ $job->schedulingInfo->locker($$);
+ $job->schedulingInfo->update;
}
});
@@ -66,9 +70,9 @@ sub checkJobs {
if ($@) {
warn $@;
$db->txn_do(sub {
- $job->busy(0);
- $job->locker($$);
- $job->update;
+ $job->schedulingInfo->busy(0);
+ $job->schedulingInfo->locker($$);
+ $job->schedulingInfo->update;
});
}
}
diff --git a/src/scheduler.pl b/src/scheduler.pl
index d1731b9d..c74bdd69 100644
--- a/src/scheduler.pl
+++ b/src/scheduler.pl
@@ -67,24 +67,15 @@ sub checkJob {
{ project => $project->name, jobset => $jobset->name
, attrname => $jobName, outPath => $outPath })) > 0)
{
- print " already done\n";
+ print " already scheduled/done\n";
return;
}
- if (scalar($db->resultset('Jobs')->search(
- { project => $project->name, jobset => $jobset->name
- , attrname => $jobName, outPath => $outPath })) > 0)
- {
- print " already queued\n";
- return;
- }
-
print " adding to queue\n";
- my $job = $db->resultset('Jobs')->create(
- { timestamp => time()
- , priority => 0
- , busy => 0
- , locker => ""
+
+ my $build = $db->resultset('Builds')->create(
+ { finished => 0
+ , timestamp => time()
, project => $project->name
, jobset => $jobset->name
, attrname => $jobName
@@ -94,10 +85,17 @@ sub checkJob {
, system => $job->{system}
});
+ $db->resultset('Buildschedulinginfo')->create(
+ { id => $build->id
+ , priority => 0
+ , busy => 0
+ , locker => ""
+ });
+
foreach my $inputName (keys %{$inputInfo}) {
my $input = $inputInfo->{$inputName};
- $db->resultset('Inputs')->create(
- { job => $job->id
+ $db->resultset('Buildinputs')->create(
+ { build => $build->id
, name => $inputName
, type => $input->{type}
, uri => $input->{uri}
@@ -151,8 +149,8 @@ sub checkJobAlternatives {
else {
(my $prevBuild) = $db->resultset('Builds')->search(
- {project => $project->name, jobset => $jobset->name, attrname => $argName, buildStatus => 0},
- {order_by => "timestamp DESC", rows => 1});
+ {finished => 1, project => $project->name, jobset => $jobset->name, attrname => $argName, buildStatus => 0},
+ {join => 'resultInfo', order_by => "timestamp DESC", rows => 1});
if (!defined $prevBuild) {
# !!! reschedule?
|