public_git
/
freenas-proxmox
mirror of https://github.com/TheGrandWazoo/freenas-proxmox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Optimize methods. 

- Instead of using foreach loops to iterate through an array change to
using a hash which the key is the value we are looking for.
This commit is contained in:
Kevin Scott Adams 2022-04-13 16:29:24 -04:00
parent 4663fca8b0
commit 85a67077b2
1 changed files with 39 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
perl5/PVE/Storage/LunCmd/FreeNAS.pm
View File

@ -199,52 +199,45 @@ sub run_list_view {
# #
# #
# # Optimized
sub run_list_lu { sub run_list_lu {
my ($scfg, $timeout, $method, $result_value_type, @params) = @_; my ($scfg, $timeout, $method, $result_value_type, @params) = @_;
my $object = $params[0]; my $object = $params[0];
syslog("info", (caller(0))[3] . " : called with (method=$method; result_value_type=$result_value_type; object=$object)");
my $result = undef; my $result = undef;
my $luns = freenas_list_lu($scfg); my $luns = freenas_list_lu($scfg);
foreach my $lun (@$luns) { syslog("info", (caller(0))[3] . " : called with (method: '$method'; result_value_type: '$result_value_type'; param[0]: '$object')");
syslog("info", (caller(0))[3] . " : Verifing '$dev_prefix$lun->{$freenas_api_variables->{'extentpath'}}' and '$object'");
if ($dev_prefix . $lun->{$freenas_api_variables->{'extentpath'}} eq $object) {
$result = $result_value_type eq "lun-id" ? $lun->{$freenas_api_variables->{'lunid'}} : $dev_prefix . $lun->{$freenas_api_variables->{'extentpath'}};
syslog("info",(caller(0))[3] . "($object) '$result_value_type' found $result");
last;
}
}
if(!defined($result)) {
syslog("info", (caller(0))[3] . "($object) : $result_value_type : lun not found");
}
$object =~ s/^\Q$dev_prefix//;
syslog("info", (caller(0))[3] . " : TrueNAS object to find: '$object'");
if (defined($luns->{$object})) {
my $lu_object = $luns->{$object};
$result = $result_value_type eq "lun-id" ? $lu_object->{$freenas_api_variables->{'lunid'}} : $dev_prefix . $lu_object->{$freenas_api_variables->{'extentpath'}};
syslog("info",(caller(0))[3] . " '$object' with key '$result_value_type' found with value: '$result'");
} else {
syslog("info", (caller(0))[3] . " '$object' with key '$result_value_type' was not found");
}
return $result; return $result;
} }
# #
# #
# # Optimzed
sub run_list_extent { sub run_list_extent {
my ($scfg, $timeout, $method, @params) = @_; my ($scfg, $timeout, $method, @params) = @_;
my $object = $params[0]; my $object = $params[0];
syslog("info", (caller(0))[3] . " : called with (method: '$method'; params[0]: '$object')");
syslog("info", (caller(0))[3] . " : called with (method=$method; object=$object)");
my $result = undef; my $result = undef;
my $luns = freenas_list_lu($scfg); my $luns = freenas_list_lu($scfg);
foreach my $lun (@$luns) {
syslog("info", (caller(0))[3] . " : Verifing '$dev_prefix$lun->{$freenas_api_variables->{'extentpath'}}' and '$object'");
if ($dev_prefix . $lun->{$freenas_api_variables->{'extentpath'}} eq $object) {
$result = $lun->{$freenas_api_variables->{'extentnaa'}};
syslog("info","FreeNAS::list_extent($object): naa found $result");
last;
}
}
if (!defined($result)) {
syslog("info","FreeNAS::list_extent($object): naa not found");
}
$object =~ s/^\Q$dev_prefix//;
syslog("info", (caller(0))[3] . " TrueNAS object to find: '$object'");
if (defined($luns->{$object})) {
my $lu_object = $luns->{$object};
$result = $lu_object->{$freenas_api_variables->{'extentnaa'}};
syslog("info",(caller(0))[3] . " '$object' wtih key '$freenas_api_variables->{'extentnaa'}' found with value: '$result'");
} else {
syslog("info",(caller(0))[3] . " '$object' with key '$freenas_api_variables->{'extentnaa'}' was not found");
}
return $result; return $result;
} }
@ -282,24 +275,24 @@ sub run_create_lu {
# #
# #
# # Optimzied
sub run_delete_lu { sub run_delete_lu {
my ($scfg, $timeout, $method, @params) = @_; my ($scfg, $timeout, $method, @params) = @_;
my $lun_path = $params[0]; my $lun_path = $params[0];
syslog("info", (caller(0))[3] . " : called with (method=$method; param[0]=$lun_path)"); syslog("info", (caller(0))[3] . " : called with (method: '$method'; param[0]: '$lun_path')");
my $luns = freenas_list_lu($scfg); my $luns = freenas_list_lu($scfg);
my $lun = undef; my $lun = undef;
my $link = undef; my $link = undef;
foreach my $item (@$luns) { $lun_path =~ s/^\Q$dev_prefix//;
if($dev_prefix . $item->{ $freenas_api_variables->{'extentpath'}} eq $lun_path) {
$lun = $item;
last;
}
}
die "Unable to find the lun $lun_path for $scfg->{target}" if !defined($lun); if (defined($luns->{$lun_path})) {
$lun = $luns->{$lun_path};
syslog("info",(caller(0))[3] . " lun: '$lun_path' found");
} else {
die "Unable to find the lun $lun_path for $scfg->{target}";
}
my $target_id = freenas_get_targetid($scfg); my $target_id = freenas_get_targetid($scfg);
die "Unable to find the target id for $scfg->{target}" if !defined($target_id); die "Unable to find the target id for $scfg->{target}" if !defined($target_id);
@ -697,7 +690,7 @@ sub freenas_list_lu {
my $targets = freenas_iscsi_get_target($scfg); my $targets = freenas_iscsi_get_target($scfg);
my $target_id = freenas_get_targetid($scfg); my $target_id = freenas_get_targetid($scfg);
my @luns = (); my %lun_hash;
my $iscsi_lunid = undef; my $iscsi_lunid = undef;
if(defined($target_id)) { if(defined($target_id)) {
@ -709,21 +702,21 @@ sub freenas_list_lu {
foreach my $node (@$extents) { foreach my $node (@$extents) {
if($node->{'id'} == $item->{$freenas_api_variables->{'extentid'}}) { if($node->{'id'} == $item->{$freenas_api_variables->{'extentid'}}) {
if ($item->{$freenas_api_variables->{'lunid'}} =~ /(\d+)/) { if ($item->{$freenas_api_variables->{'lunid'}} =~ /(\d+)/) {
$iscsi_lunid = "$1"; if (defined($node)) {
$node->{$freenas_api_variables->{'lunid'}} .= "$1";
$lun_hash{$node->{$freenas_api_variables->{'extentpath'}}} = $node;
}
last;
} else { } else {
syslog("info", (caller(0))[3] . " : iscsi_lunid did not pass tainted testing"); syslog("warn", (caller(0))[3] . " : iscsi_lunid did not pass tainted testing");
next;
} }
$node->{$freenas_api_variables->{'lunid'}} .= $iscsi_lunid;
push(@luns , $node);
last;
} }
} }
} }
} }
} }
syslog("info", (caller(0))[3] . " : successful"); syslog("info", (caller(0))[3] . " : successful");
return \@luns; return \%lun_hash;
} }
# #