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

allow loop oid error to propagate

Browse Source
This commit is contained in:
Oliver Gorwits
2021-11-25 11:47:29 +00:00
parent 2e8384df5a
commit c7f0c6d63f
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/App/Netdisco/Worker/Plugin/Snapshot.pm
View File

@@ -40,7 +40,10 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
my %munges = get_munges($snmp); my %munges = get_munges($snmp);
# only if not pseudo device # only if not pseudo device
walk_and_store($device, $snmp, %oidmap) if not $device->is_pseudo; if (not $device->is_pseudo) {
my $walk_error = walk_and_store($device, $snmp, %oidmap);
return $walk_error if $walk_error;
}
# load the cache # load the cache
my %cache = %{ $snmp->cache() }; my %cache = %{ $snmp->cache() };
@@ -137,15 +140,18 @@ sub get_munges {
sub walk_and_store { sub walk_and_store {
my ($device, $snmp, %oidmap) = @_; my ($device, $snmp, %oidmap) = @_;
my %walk = walker($device, $snmp, '.1.3.6.1'); # 10205 rows my $walk = walker($device, $snmp, '.1.3.6.1'); # 10205 rows
# my %walk = walker($device, $snmp, '.1.3.6.1.2.1.2.2.1.6'); # 22 rows, i_mac/ifPhysAddress # my %walk = walker($device, $snmp, '.1.3.6.1.2.1.2.2.1.6'); # 22 rows, i_mac/ifPhysAddress
# something went wrong - error
return $walk if ref {} ne ref $walk;
# take the snmpwalk of the device which is numeric (no MIB translateObj), # take the snmpwalk of the device which is numeric (no MIB translateObj),
# resolve to MIB identifiers using netdisco-mibs, then store in SNMP::Info # resolve to MIB identifiers using netdisco-mibs, then store in SNMP::Info
# instance cache # instance cache
my (%tables, %leaves, @realoids) = ((), (), ()); my (%tables, %leaves, @realoids) = ((), (), ());
OID: foreach my $orig_oid (keys %walk) { OID: foreach my $orig_oid (keys %$walk) {
my $oid = $orig_oid; my $oid = $orig_oid;
my $idx = ''; my $idx = '';
@@ -160,11 +166,11 @@ sub walk_and_store {
if ($idx eq 0) { if ($idx eq 0) {
push @realoids, $oid; push @realoids, $oid;
$leaves{ $leaf } = $walk{$orig_oid}; $leaves{ $leaf } = $walk->{$orig_oid};
} }
else { else {
push @realoids, $oid if !exists $tables{ $leaf }; push @realoids, $oid if !exists $tables{ $leaf };
$tables{ $leaf }->{$idx} = $walk{$orig_oid}; $tables{ $leaf }->{$idx} = $walk->{$orig_oid};
} }
# debug "snapshot $device - cached $oidmap{$oid}($idx) from $orig_oid"; # debug "snapshot $device - cached $oidmap{$oid}($idx) from $orig_oid";
@@ -228,7 +234,7 @@ sub walker {
return unless defined $sess; return unless defined $sess;
my $REPEATERS = 20; my $REPEATERS = 20;
my $ver = $snmp->snmp_ver(); my $ver = $snmp->snmp_ver();
# debug "snapshot $device - $base translated as $qual_leaf"; # debug "snapshot $device - $base translated as $qual_leaf";
my $var = SNMP::Varbind->new( [$base] ); my $var = SNMP::Varbind->new( [$base] );
@@ -313,8 +319,7 @@ sub walker {
if ($loopdetect) { if ($loopdetect) {
# Check to see if we've already seen this IID (looping) # Check to see if we've already seen this IID (looping)
if ( defined $seen{$oid} and $seen{$oid} ) { if ( defined $seen{$oid} and $seen{$oid} ) {
error "Looping on: oid: $oid"; return Status->error("Looping on: oid: $oid");
last;
} }
else { else {
$seen{$oid}++; $seen{$oid}++;
@@ -336,7 +341,7 @@ sub walker {
debug sprintf "snapshot $device - walked %d rows from $base", debug sprintf "snapshot $device - walked %d rows from $base",
scalar keys %localstore; scalar keys %localstore;
return %localstore; return \%localstore;
} }
true; true;