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

Use cursor to speed up get_port_macs(). This provides a significant performance improvement in both macsuck and macwalk operations especially in deployments with a large number of devices and device interfaces.

Browse Source
This commit is contained in:
Eric A. Miller
2013-10-25 19:00:50 -04:00
parent 9d426e64a1
commit c0c8edf6f0
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Netdisco/lib/App/Netdisco/Util/PortMAC.pm
View File

@@ -32,22 +32,29 @@ sub get_port_macs {
my $device = shift;
my $port_macs = {};
unless ($device->in_storage) {
debug sprintf ' [%s] get_port_macs - skipping device not yet discovered',
unless ( $device->in_storage ) {
debug sprintf
' [%s] get_port_macs - skipping device not yet discovered',
$device->ip;
return $port_macs;
}
my $dp_macs = schema('netdisco')->resultset('DevicePort')
->search({ mac => { '!=' => undef} });
while (my $r = $dp_macs->next) {
$port_macs->{ $r->mac } = $r->ip;
my $dp_macs
= schema('netdisco')->resultset('DevicePort')
->search( { mac => { '!=' => undef } },
{ select => [ 'mac', 'ip' ] } );
my $dp_cursor = $dp_macs->cursor;
while ( my @vals = $dp_cursor->next ) {
$port_macs->{ $vals[0] } = $vals[1];
}
my $d_macs = schema('netdisco')->resultset('Device')
->search({ mac => { '!=' => undef} });
while (my $r = $d_macs->next) {
$port_macs->{ $r->mac } = $r->ip;
my $d_macs
= schema('netdisco')->resultset('Device')
->search( { mac => { '!=' => undef } },
{ select => [ 'mac', 'ip' ] } );
my $d_cursor = $d_macs->cursor;
while ( my @vals = $d_cursor->next ) {
$port_macs->{ $vals[0] } = $vals[1];
}
return $port_macs;