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

#1066 implement snmp_try_slow_connect and fast device discover from queue

Browse Source
This commit is contained in:
Oliver Gorwits
2023-07-14 17:37:52 +01:00
parent 2f7e3f80a3
commit eac55a581d
5 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/App/Netdisco/Worker/Loader.pm
View File

@@ -31,27 +31,28 @@ sub load_workers {
if $plugin !~ m/^\+/;
$plugin =~ s/^\+//;
next unless $plugin =~ m/::Plugin::${action}(?:::|$)/i;
next unless $plugin =~ m/::Plugin::(?:${action}|Internal)(?:::|$)/i;
$ENV{ND2_LOG_PLUGINS} && debug "loading worker plugin $plugin";
Module::Load::load $plugin;
}
# now vars->{workers} is populated, we set the dispatch order
my $workers = vars->{'workers'}->{$action} || {};
my %workers = ( %{ vars->{'workers'}->{$action} || {} },
%{ vars->{'workers'}->{'internal'} || {} } );
my $driverless_main = 0;
#use DDP; p vars->{'workers'};
# use DDP; p vars{'workers'}; p %workers;
foreach my $phase (qw/check early main user store late/) {
my $pname = "workers_${phase}";
my @wset = ();
foreach my $namespace (sort keys %{ $workers->{$phase} }) {
foreach my $namespace (sort keys %{ $workers{$phase} }) {
foreach my $priority (sort {$b <=> $a}
keys %{ $workers->{$phase}->{$namespace} }) {
keys %{ $workers{$phase}->{$namespace} }) {
++$driverless_main if $phase eq 'main'
and ($priority == 0 or $priority == setting('driver_priority')->{'direct'});
push @wset, @{ $workers->{$phase}->{$namespace}->{$priority} };
push @wset, @{ $workers{$phase}->{$namespace}->{$priority} };
}
}

18
lib/App/Netdisco/Worker/Plugin/Internal/SNMPFastDiscover.pm Normal file
View File

@@ -0,0 +1,18 @@
package App::Netdisco::Worker::Plugin::Internal::SNMPFastDiscover;
use Dancer ':syntax';
use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status';
register_worker({ phase => 'check', driver => 'direct' }, sub {
my ($job, $workerconf) = @_;
# if the job is a queued job, and discover, and the first one...
if ($job->job and $job->action eq 'discover' and not $job->log) {
config->{'snmp_try_slow_connect'} = false;
debug sprintf '[%s] skipping long SNMP timeouts for initial discover',
$job->device;
}
});
true;