snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

hydra-queue-runner: Tweaked the selection method

Browse source 
Pick the jobset that has used the smallest fraction of its share,
rather than the jobset furthest below its share in absolute terms.
This gives jobsets with a small share a quicker start (but they
will also run out of their share quicker).
This commit is contained in:
Eelco Dolstra 2013-09-21 19:54:58 +00:00
parent cf43c605cd
commit 77dbf55abb
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/script/hydra-queue-runner
View file

@ -145,15 +145,15 @@ sub checkBuilds {
$timeSpentPerJobset->{$b->get_column('project')}->{$b->get_column('jobset')} = $timeSpent; $timeSpentPerJobset->{$b->get_column('project')}->{$b->get_column('jobset')} = $timeSpent;
} }
my $share = $jobset->schedulingshares; my $share = $jobset->schedulingshares || 1; # prevent division by zero
my $delta = ($share / $totalShares) - ($duration / $totalWindowSize); my $used = $timeSpent / ($totalWindowSize * ($share / $totalShares));
#printf STDERR "%s:%s: %d s, %.3f%%, allowance = %.3f%%\n", $jobset->get_column('project'), $jobset->name, $duration, $duration / $totalWindowSize, $delta; #printf STDERR "%s:%s: %d s, total used = %.2f%%, share used = %.2f%%\n", $jobset->get_column('project'), $jobset->name, $timeSpent, $timeSpent / $totalWindowSize * 100, $used * 100;
push @res, { jobset => $jobset, delta => $delta }; push @res, { jobset => $jobset, used => $used };
} }
foreach my $r (sort { $b->{delta} <=> $a->{delta} } @res) { foreach my $r (sort { $a->{used} <=> $b->{used} } @res) {
my $jobset = $r->{jobset}; my $jobset = $r->{jobset};
#print STDERR "selected ", $jobset->get_column('project'), ':', $jobset->name, "\n"; #print STDERR "selected ", $jobset->get_column('project'), ':', $jobset->name, "\n";
@ -173,8 +173,8 @@ sub checkBuilds {
} }
next if $build->busy; next if $build->busy;
printf STDERR "starting build %d (%s:%s:%s) on %s (jobset allowance = %.3f%%)\n", printf STDERR "starting build %d (%s:%s:%s) on %s; jobset at %.2f%% of its share\n",
$build->id, $build->project->name, $build->jobset->name, $build->job->name, $build->system, $r->{delta}; $build->id, $build->project->name, $build->jobset->name, $build->job->name, $build->system, $r->{used} * 100;
my $logfile = getcwd . "/logs/" . $build->id; my $logfile = getcwd . "/logs/" . $build->id;
mkdir(dirname $logfile); mkdir(dirname $logfile);