ACL support for scheduled jobs (#1106)

implements #580
This commit is contained in:
Oliver Gorwits
2023-09-27 12:03:49 +01:00
committed by GitHub
parent 389823bf09
commit 993edd0c6a
4 changed files with 129 additions and 17 deletions

View File

@@ -3,7 +3,9 @@ package App::Netdisco::Backend::Role::Scheduler;
use Dancer qw/:moose :syntax :script/;
use NetAddr::IP;
use JSON::PP ();
use Algorithm::Cron;
use App::Netdisco::Util::MCE;
use App::Netdisco::JobQueue qw/jq_insert/;
@@ -23,6 +25,12 @@ sub worker_begin {
my $config = setting('schedule')->{$action}
or next;
if (not $config->{when}) {
error sprintf 'sch (%s): schedule %s is missing time spec',
$wid, $action;
next;
}
# accept either single crontab format, or individual time fields
$config->{when} = Algorithm::Cron->new(
base => 'local',
@@ -44,6 +52,8 @@ sub worker_body {
return debug "sch ($wid): no need for scheduler... quitting"
}
my $coder = JSON::PP->new->utf8(0)->allow_nonref(1)->allow_unknown(1);
while (1) {
# sleep until some point in the next minute
my $naptime = 60 - (time % 60) + int(rand(45));
@@ -68,21 +78,31 @@ sub worker_body {
$win_start, $win_end, $sched->{when}->next_time($win_start);
next unless $sched->{when}->next_time($win_start) <= $win_end;
my $net = NetAddr::IP->new($sched->{device});
next if ($sched->{device}
and (!$net or $net->num == 0 or $net->addr eq '0.0.0.0'));
my @hostlist = map { (ref $_) ? $_->addr : undef }
(defined $sched->{device} ? ($net->hostenum) : (undef));
my @job_specs = ();
foreach my $host (@hostlist) {
push @job_specs, {
action => $real_action,
device => $host,
port => $sched->{port},
subaction => $sched->{extra},
};
if ($sched->{only} or $sched->{no}) {
$sched->{label} = $action;
push @job_specs, {
action => 'scheduler',
subaction => $coder->encode($sched),
};
}
else {
my $net = NetAddr::IP->new($sched->{device});
next if ($sched->{device}
and (!$net or $net->num == 0 or $net->addr eq '0.0.0.0'));
my @hostlist = map { (ref $_) ? $_->addr : undef }
(defined $sched->{device} ? ($net->hostenum) : (undef));
foreach my $host (@hostlist) {
push @job_specs, {
action => $real_action,
device => $host,
port => $sched->{port},
subaction => $sched->{extra},
};
}
}
info sprintf 'sched (%s): queueing %s %s jobs',