yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LIO: followup: various small cleanups

Browse Source 
move two loop bodies from

if (condition) {
    ...
}

too
next if !condition;

...

to save an indentation level

rename variables to a bit shorter version, i.e.:
s/oneTarget/target/
s/oneTpg/tpg/

and a comment rewording

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2018-08-02 14:43:27 +02:00
parent ff69c66022
commit f15ac9b5a8
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
PVE/Storage/LunCmd/LIO.pm
View File

@ -139,16 +139,15 @@ my $parser = sub {
my $jsonconfig = JSON->new->utf8->decode($config); my $jsonconfig = JSON->new->utf8->decode($config);
my $haveTarget = 0; my $haveTarget = 0;
foreach my $oneTarget (@{$jsonconfig->{targets}}) { foreach my $target (@{$jsonconfig->{targets}}) {
# only interested in iSCSI targets # only interested in iSCSI targets
if ($oneTarget->{fabric} eq 'iscsi' && $oneTarget->{wwn} eq $scfg->{target}) { next if !($target->{fabric} eq 'iscsi' && $target->{wwn} eq $scfg->{target});
# find correct TPG # find correct TPG
foreach my $oneTpg (@{$oneTarget->{tpgs}}) { foreach my $tpg (@{$target->{tpgs}}) {
if ($oneTpg->{tag} == $tpg_tag) { if ($tpg->{tag} == $tpg_tag) {
$SETTINGS->{target} = $oneTpg; $SETTINGS->{target} = $tpg;
$haveTarget = 1; $haveTarget = 1;
last; last;
}
} }
} }
} }
@ -162,8 +161,8 @@ my $parser = sub {
# removes the given lu_name from the local list of luns # removes the given lu_name from the local list of luns
my $free_lu_name = sub { my $free_lu_name = sub {
my ($lu_name) = @_; my ($lu_name) = @_;
my $new;
my $new = [];
foreach my $lun (@{$SETTINGS->{target}->{luns}}) { foreach my $lun (@{$SETTINGS->{target}->{luns}}) {
if ($lun->{storage_object} ne "$BACKSTORE/$lu_name") { if ($lun->{storage_object} ne "$BACKSTORE/$lu_name") {
push @$new, $lun; push @$new, $lun;
@ -286,29 +285,29 @@ my $delete_lun = sub {
my $volname = $extract_volname->($scfg, $params[0]); my $volname = $extract_volname->($scfg, $params[0]);
foreach my $lun (@{$SETTINGS->{target}->{luns}}) { foreach my $lun (@{$SETTINGS->{target}->{luns}}) {
if ($lun->{storage_object} eq "$BACKSTORE/$volname") { next if $lun->{storage_object} ne "$BACKSTORE/$volname";
# step 1: delete the lun
my @cliparams = ("/iscsi/$scfg->{target}/$tpg/luns/", 'delete', "lun$lun->{index}" );
my $res = $execute_remote_command->($scfg, $timeout, $targetcli, @cliparams);
do {
die $res->{msg};
} unless $res->{result};
# step 2: delete the backstore # step 1: delete the lun
@cliparams = ($BACKSTORE, 'delete', $volname); my @cliparams = ("/iscsi/$scfg->{target}/$tpg/luns/", 'delete', "lun$lun->{index}" );
$res = $execute_remote_command->($scfg, $timeout, $targetcli, @cliparams); my $res = $execute_remote_command->($scfg, $timeout, $targetcli, @cliparams);
do { do {
die $res->{msg}; die $res->{msg};
} unless $res->{result}; } unless $res->{result};
# step 3: save to be safe ... # step 2: delete the backstore
$execute_remote_command->($scfg, $timeout, $targetcli, 'saveconfig'); @cliparams = ($BACKSTORE, 'delete', $volname);
$res = $execute_remote_command->($scfg, $timeout, $targetcli, @cliparams);
do {
die $res->{msg};
} unless $res->{result};
# update interal cache # step 3: save to be safe ...
$free_lu_name->($volname); $execute_remote_command->($scfg, $timeout, $targetcli, 'saveconfig');
last; # update interal cache
} $free_lu_name->($volname);
last;
} }
return $res->{msg}; return $res->{msg};
@ -352,8 +351,7 @@ my %lun_cmd_map = (
sub run_lun_command { sub run_lun_command {
my ($scfg, $timeout, $method, @params) = @_; my ($scfg, $timeout, $method, @params) = @_;
# fetch configuration from target if we haven't yet # fetch configuration from target if we haven't yet or if it is stale
# or if our configuration is stale
my $timediff = time - $SETTINGS_TIMESTAMP; my $timediff = time - $SETTINGS_TIMESTAMP;
if (!$SETTINGS || $timediff > $SETTINGS_MAXAGE) { if (!$SETTINGS || $timediff > $SETTINGS_MAXAGE) {
$SETTINGS_TIMESTAMP = time; $SETTINGS_TIMESTAMP = time;