135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

initial implementatin of new job queue with skip info per job

Browse Source
This commit is contained in:
Oliver Gorwits
2018-04-25 21:43:39 +01:00
parent 5eb443438c
commit 7e1982985c
9 changed files with 187 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm
View File

@@ -8,6 +8,11 @@ use Dancer::Plugin::Auth::Extensible;
use App::Netdisco::Web::Plugin;
use App::Netdisco::JobQueue qw/jq_log jq_delete/;
use utf8;
use Time::Piece;
use Text::CSV_XS 'csv';
use NetAddr::IP::Lite ':lower';
register_admin_task({
tag => 'jobqueue',
label => 'Job Queue',
@@ -23,9 +28,61 @@ ajax '/ajax/control/admin/jobqueue/delall' => require_role admin => sub {
};
ajax '/ajax/content/admin/jobqueue' => require_role admin => sub {
my $filter = NetAddr::IP::Lite->new(param('q'));
my @data = jq_log($filter);
foreach my $r (@data) {
$r->{qstat}->{acl} = [];
$r->{qstat}->{next} = [];
$r->{qstat}->{fails} = [];
next unless ($r->{status} eq 'queued');
foreach my $s (@{$r->{skips}}) {
(my $row = $s) =~ s/(^\(|\)$)//g;
next unless $row;
my %skip = @{ [@{csv(in => \$row)}]->[0] };
next unless scalar keys %skip;
$skip{actionset} =~ s/(^{|}$)//g;
$skip{actionset} = [@{ csv(in => \$skip{actionset}) }]->[0] || [];
if ($skip{deferrals}) {
unshift @{$r->{qstat}->{fails}}, sprintf '%s connection failure%s from %s',
$skip{deferrals}, ($skip{deferrals} > 1 ? 's' : ''), $skip{backend};
}
else {
unshift @{$r->{qstat}->{fails}}, sprintf 'No connection failures from %s',
$skip{backend};
}
if (scalar @{$skip{actionset}}
and scalar grep {$_ eq $r->{action}} @{$skip{actionset}}) {
$r->{qstat}->{badacl} = true;
unshift @{$r->{qstat}->{acl}}, sprintf 'Blocked by ACL on %s', $skip{backend};
}
else {
push @{$r->{qstat}->{acl}}, sprintf '✔ on %s', $skip{backend};
}
if ($skip{deferrals} >= setting('workers')->{'max_deferrals'}) {
$r->{qstat}->{last_defer} = true;
my $after = (localtime($skip{last_defer}) + setting('workers')->{'retry_after'});
unshift @{$r->{qstat}->{next}}, sprintf 'Will retry after %s on %s',
$after->cdate, $skip{backend};
}
elsif ($skip{deferrals} > 0) {
$r->{qstat}->{last_defer} = true;
unshift @{$r->{qstat}->{next}}, sprintf 'Connect failed at %s on %s',
localtime($skip{last_defer})->cdate, $skip{backend};
}
else {
push @{$r->{qstat}->{next}}, sprintf '✔ on %s', $skip{backend};
}
}
}
content_type('text/html');
template 'ajax/admintask/jobqueue.tt', {
results => [ jq_log ],
results => \@data,
}, { layout => undef };
};