No SystemTypes

doc/dev-notes.txt

@@ -6,10 +6,6 @@
 
   $ DBIC_TRACE=1 ./script/hydra_server.pl
 
-* Setting the maximum number of concurrent builds per system type:
-
-  $ sqlite3 hydra.sqlite "insert into SystemTypes(system, maxConcurrent) values('i686-linux', 3);"
-
 * Creating a user:
 
   $ sqlite3 hydra.sqlite "insert into Users(userName, emailAddress, password) values('root', 'e.dolstra@tudelft.nl', '$(echo -n foobar | sha1sum | cut -c1-40)');"

src/lib/Hydra/Controller/Admin.pm

@@ -11,35 +11,6 @@ use Digest::SHA1 qw(sha1_hex);
 use Config::General;
 
 
-sub nixMachines {
-    my ($c) = @_;
-    my $result = "# GENERATED BY HYDRA\n";
-
-    foreach my $machine ($c->model("DB::BuildMachines")->all) {
-        if($machine->enabled) {
-            $result = $result . $machine->username . '@'. $machine->hostname . ' ';
-            foreach my $system ($machine->buildmachinesystemtypes) {
-                $result = $result . $system->system .',';
-            }
-            chop $result;
-            $result = $result . ' '. $machine->ssh_key . ' ' . $machine->maxconcurrent . ' '. $machine->speedfactor . ' ' . $machine->options . "\n";
-        }
-    }
-    return $result;
-}
-
-
-sub saveNixMachines {
-    my ($c) = @_;
-
-    die("File not writable: /etc/nix.machines") if ! -w "/etc/nix.machines" ;
-
-    open (NIXMACHINES, '>/etc/nix.machines') or die("Could not write to /etc/nix.machines");
-    print NIXMACHINES nixMachines($c);
-    close (NIXMACHINES);
-}
-
-
 sub admin : Chained('/') PathPart('admin') CaptureArgs(0) {
     my ($self, $c) = @_;
     requireAdmin($c);
@@ -56,133 +27,11 @@ sub users : Chained('admin') PathPart('users') Args(0) {
 
 sub machines : Chained('admin') PathPart('machines') Args(0) {
     my ($self, $c) = @_;
-    $c->stash->{machines} = [$c->model('DB::BuildMachines')->search({}, {order_by => "hostname"})];
-    $c->stash->{systems} = [$c->model('DB::SystemTypes')->search({}, {select => ["system"], order_by => "system" })];
-    $c->stash->{nixMachines} = nixMachines($c);
-    $c->stash->{nixMachinesWritable} = (-e "/etc/nix.machines" && -w "/etc/nix.machines");
-
+    $c->stash->{machines} = getMachines;
     $c->stash->{template} = 'machines.tt';
 }
 
 
-sub machine : Chained('admin') PathPart('machine') CaptureArgs(1) {
-    my ($self, $c, $machineName) = @_;
-
-    requireAdmin($c);
-
-    my $machine = $c->model('DB::BuildMachines')->find($machineName)
-        or notFound($c, "Machine $machineName doesn't exist.");
-
-    $c->stash->{machine} = $machine;
-}
-
-
-sub machine_edit : Chained('machine') PathPart('edit') Args(0) {
-    my ($self, $c) = @_;
-    $c->stash->{template} = 'machine.tt';
-    $c->stash->{systemtypes} = [$c->model('DB::SystemTypes')->search({}, {order_by => "system"})];
-    $c->stash->{edit} = 1;
-}
-
-
-sub machine_edit_submit : Chained('machine') PathPart('submit') Args(0) {
-    my ($self, $c) = @_;
-    requirePost($c);
-
-    txn_do($c->model('DB')->schema, sub {
-        if (($c->request->params->{submit} || "") eq "delete") {
-            $c->stash->{machine}->delete;
-        } else {
-            updateMachine($c, $c->stash->{machine});
-        }
-    });
-
-    saveNixMachines($c);
-
-    $c->res->redirect("/admin/machines");
-}
-
-
-sub updateMachine {
-    my ($c, $machine) = @_;
-
-    my $hostname      = trim $c->request->params->{"hostname"};
-    my $username      = trim $c->request->params->{"username"};
-    my $maxconcurrent = trim $c->request->params->{"maxconcurrent"};
-    my $speedfactor   = trim $c->request->params->{"speedfactor"};
-    my $ssh_key       = trim $c->request->params->{"ssh_key"};
-    my $options       = trim $c->request->params->{"options"};
-    my $systems       = $c->request->params->{"systems"} ;
-
-    error($c, "Invalid or empty username.") if $username eq "";
-    error($c, "Max concurrent builds should be an integer > 0.") if $maxconcurrent eq "" || ! $maxconcurrent =~ m/[0-9]+/;
-    error($c, "Speed factor should be an integer > 0.") if $speedfactor eq "" || ! $speedfactor =~ m/[0-9]+/;
-    error($c, "Invalid or empty SSH key.") if $ssh_key eq "";
-
-    $machine->update(
-        { username => $username
-        , maxconcurrent => $maxconcurrent
-        , speedfactor => $speedfactor
-        , ssh_key => $ssh_key
-        , options => $options
-        });
-    $machine->buildmachinesystemtypes->delete_all;
-    if(ref($systems) eq 'ARRAY') {
-            for my $s (@$systems) {
-                $machine->buildmachinesystemtypes->create({ system => $s}) ;
-            }
-    } else {
-        $machine->buildmachinesystemtypes->create({ system => $systems}) ;
-    }
-}
-
-
-sub create_machine : Chained('admin') PathPart('create-machine') Args(0) {
-    my ($self, $c) = @_;
-
-    requireAdmin($c);
-
-    $c->stash->{template} = 'machine.tt';
-    $c->stash->{systemtypes} = [$c->model('DB::SystemTypes')->search({}, {order_by => "system"})];
-    $c->stash->{edit} = 1;
-    $c->stash->{create} = 1;
-}
-
-
-sub create_machine_submit : Chained('admin') PathPart('create-machine/submit') Args(0) {
-    my ($self, $c) = @_;
-
-    requireAdmin($c);
-
-    my $hostname = trim $c->request->params->{"hostname"};
-    error($c, "Invalid or empty hostname.") if $hostname eq "";
-
-    txn_do($c->model('DB')->schema, sub {
-        my $machine = $c->model('DB::BuildMachines')->create(
-            { hostname => $hostname });
-        updateMachine($c, $machine);
-    });
-    saveNixMachines($c);
-    $c->res->redirect("/admin/machines");
-}
-
-
-sub machine_enable : Chained('machine') PathPart('enable') Args(0) {
-    my ($self, $c) = @_;
-    $c->stash->{machine}->update({ enabled => 1});
-    saveNixMachines($c);
-    $c->res->redirect("/admin/machines");
-}
-
-
-sub machine_disable : Chained('machine') PathPart('disable') Args(0) {
-    my ($self, $c) = @_;
-    $c->stash->{machine}->update({ enabled => 0});
-    saveNixMachines($c);
-    $c->res->redirect("/admin/machines");
-}
-
-
 sub clear_queue_non_current : Chained('admin') Path('clear-queue-non-current') Args(0) {
     my ($self, $c) = @_;
     $c->model('DB::Builds')->search({finished => 0, iscurrent => 0, busy => 0})->update({ finished => 1, buildstatus => 4, timestamp => time});

src/lib/Hydra/Controller/Root.pm

@@ -74,12 +74,14 @@ sub status :Local {
 
 sub machines :Local Args(0) {
     my ($self, $c) = @_;
-    $c->stash->{machines} = [$c->model('DB::BuildMachines')->search(
-        {},
-        { order_by => ["enabled DESC", "hostname"]
-        , '+select' => ["(select bs.stoptime from buildsteps as bs where bs.machine = (me.username || '\@' || me.hostname) and not bs.stoptime is null order by bs.stoptime desc limit 1)"]
-        , '+as' => ['idle']
-        })];
+    my $machines = getMachines;
+    my $idles = $c->model('DB::BuildSteps')->search(
+            { stoptime => { '!=', undef } },
+            { select => [ 'machine', { max => 'stoptime', -as => 'max_stoptime' }], group_by => "machine" });
+    while (my $idle = $idles->next) {
+        ${$machines}{$idle->machine}{'idle'} = $idle->max_stoptime;
+    }
+    $c->stash->{machines} = $machines;
     $c->stash->{steps} = [ $c->model('DB::BuildSteps')->search(
         { finished => 0, 'me.busy' => 1, 'build.busy' => 1, },
         { join => [ 'build' ]

src/lib/Hydra/Helper/Nix.pm

@@ -16,7 +16,7 @@ our @EXPORT = qw(
     getViewResult getLatestSuccessfulViewResult
     jobsetOverview removeAsciiEscapes getDrvLogPath logContents
     getMainOutput
-    getEvals);
+    getEvals getMachines);
 
 
 sub getHydraHome {
@@ -373,5 +373,33 @@ sub getEvals {
     return [@res];
 }
 
+sub getMachines {
+    my $machinesConf = $ENV{"NIX_REMOTE_SYSTEMS"} || "/etc/nix.machines";
+
+    # Read the list of machines.
+    my %machines = ();
+    if (-e $machinesConf) {
+        open CONF, "<$machinesConf" or die;
+        while (<CONF>) {
+            chomp;
+            s/\#.*$//g;
+            next if /^\s*$/;
+            my @tokens = split /\s/, $_;
+            my @supportedFeatures = split(/,/, $tokens[5] || "");
+            my @mandatoryFeatures = split(/,/, $tokens[6] || "");
+            $machines{$tokens[0]} =
+                { systemTypes => [ split(/,/, $tokens[1]) ]
+                , sshKeys => $tokens[2]
+                , maxJobs => int($tokens[3])
+                , speedFactor => 1.0 * (defined $tokens[4] ? int($tokens[4]) : 1)
+                , supportedFeatures => [ @supportedFeatures, @mandatoryFeatures ]
+                , mandatoryFeatures => [ @mandatoryFeatures ]
+                };
+        }
+        close CONF;
+    }
+    return \%machines;
+}
+
 
 1;