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

#228 timeout setting (default 10min) for backend jobs

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-31 14:02:11 +00:00
parent afeac23fba
commit 2c0d0b3cc7
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Build.PL
View File

@@ -64,7 +64,8 @@ Module::Build->new(
'Sereal' => '0', 'Sereal' => '0',
'Socket6' => '0.23', 'Socket6' => '0.23',
'Starman' => '0.4008', 'Starman' => '0.4008',
'Storable' => 0, 'Storable' => '0',
'Sys::SigAction' => '0',
'SNMP::Info' => '3.40', 'SNMP::Info' => '3.40',
'SQL::Translator' => '0.11018', 'SQL::Translator' => '0.11018',
'Template' => '2.24', 'Template' => '2.24',
@@ -75,7 +76,7 @@ Module::Build->new(
'Try::Tiny' => '0', 'Try::Tiny' => '0',
'URI' => '0', 'URI' => '0',
'URL::Encode' => '0.03', 'URL::Encode' => '0.03',
'URL::Encode::XS' => 0, 'URL::Encode::XS' => '0',
'YAML' => '0.84', 'YAML' => '0.84',
'YAML::XS' => '0.41', 'YAML::XS' => '0.41',
}, },

5
Changes
View File

@@ -1,5 +1,10 @@
2.038033 - 2018-01-?? 2.038033 - 2018-01-??
[NEW FEATURES]
* #228 timeout setting (default 10min) for backend jobs
* #341 timeout setting for all actions ("<actionname>_timeout")
[BUG FIXES] [BUG FIXES]
* #367 buttons in the neighbourmap have an incorrect height * #367 buttons in the neighbourmap have an incorrect height

22
lib/App/Netdisco/Worker/Runner.pm
View File

@@ -6,9 +6,11 @@ use App::Netdisco::Util::Permission qw/check_acl_no check_acl_only/;
use aliased 'App::Netdisco::Worker::Status'; use aliased 'App::Netdisco::Worker::Status';
use Try::Tiny; use Try::Tiny;
use Time::HiRes ();
use Module::Load (); use Module::Load ();
use Scope::Guard 'guard'; use Scope::Guard 'guard';
use Storable 'dclone'; use Storable 'dclone';
use Sys::SigAction 'timeout_call';
use Moo::Role; use Moo::Role;
use namespace::clean; use namespace::clean;
@@ -55,12 +57,30 @@ sub run {
my $configguard = guard { set(device_auth => \@userconf) }; my $configguard = guard { set(device_auth => \@userconf) };
set(device_auth => \@newuserconf); set(device_auth => \@newuserconf);
my $runner = sub {
my ($self, $job) = @_;
# run check phase and if there are workers then one MUST be successful # run check phase and if there are workers then one MUST be successful
$self->run_workers('workers_check'); $self->run_workers('workers_check');
return if not $job->check_passed;
# run other phases # run other phases
if ($job->check_passed) {
$self->run_workers("workers_${_}") for qw/early main user/; $self->run_workers("workers_${_}") for qw/early main user/;
}
};
my $maxtime = ((defined setting($job->action .'_timeout'))
? setting($job->action .'_timeout') : setting('timeout'));
if ($maxtime) {
debug sprintf '%s: running with timeout %ss', $job->action, $maxtime;
if (timeout_call($maxtime, $runner, ($self, $job))) {
debug sprintf '%s: timed out!', $job->action;
$job->add_status( Status->error("job timed out after $maxtime sec") );
}
}
else {
$runner->($self, $job);
}
} }
sub run_workers { sub run_workers {

1
share/config.yml
View File

@@ -199,6 +199,7 @@ snmptimeout: 3000000
snmpretries: 2 snmpretries: 2
devices_no: [] devices_no: []
devices_only: [] devices_only: []
timeout: 600
discover_no: [] discover_no: []
discover_only: [] discover_only: []
discover_no_type: discover_no_type: