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

LIO: Make the target cache works per target and portal

Browse Source 
When working with several ZFS over iSCSI / LIO storages, we might lookup
between them with less than 15 sec interval.
Previously, the cache of the previous storage was used, which was breaking
disk move for example

Signed-off-by: Daniel Berteaud <daniel@firewall-services.com>
This commit is contained in:
Daniel Berteaud
2019-09-26 17:27:00 +02:00
committed by Thomas Lamprecht
parent 61137a54d6
commit 609f8ec6cf
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,15 @@ my $get_config = sub {
return $config; return $config;
}; };
# Return settings of a specific target
my $get_target_settings = sub {
my ($scfg) = @_;
my $id = "$scfg->{portal}.$scfg->{target}";
return undef if !$SETTINGS;
return $SETTINGS->{$id};
};
# fetches and parses targetcli config from the portal # fetches and parses targetcli config from the portal
my $parser = sub { my $parser = sub {
my ($scfg) = @_; my ($scfg) = @_;
@ -145,7 +154,8 @@ my $parser = sub {
# find correct TPG # find correct TPG
foreach my $tpg (@{$target->{tpgs}}) { foreach my $tpg (@{$target->{tpgs}}) {
if ($tpg->{tag} == $tpg_tag) { if ($tpg->{tag} == $tpg_tag) {
$SETTINGS->{target} = $tpg; my $id = "$scfg->{portal}.$scfg->{target}";
$SETTINGS->{$id} = $tpg;
$haveTarget = 1; $haveTarget = 1;
last; last;
} }
@ -160,16 +170,17 @@ 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 ($scfg, $lu_name) = @_;
my $new = []; my $new = [];
foreach my $lun (@{$SETTINGS->{target}->{luns}}) { my $target = $get_target_settings->($scfg);
foreach my $lun (@{$target->{luns}}) {
if ($lun->{storage_object} ne "$BACKSTORE/$lu_name") { if ($lun->{storage_object} ne "$BACKSTORE/$lu_name") {
push @$new, $lun; push @$new, $lun;
} }
} }
$SETTINGS->{target}->{luns} = $new; $target->{luns} = $new;
}; };
# locally registers a new lun # locally registers a new lun
@ -181,7 +192,8 @@ my $register_lun = sub {
storage_object => "$BACKSTORE/$volname", storage_object => "$BACKSTORE/$volname",
is_new => 1, is_new => 1,
}; };
push @{$SETTINGS->{target}->{luns}}, $conf; my $target = $get_target_settings->($scfg);
push @{$target->{luns}}, $conf;
return $conf; return $conf;
}; };
@ -206,10 +218,11 @@ my $list_view = sub {
my $object = $params[0]; my $object = $params[0];
my $volname = $extract_volname->($scfg, $object); my $volname = $extract_volname->($scfg, $object);
my $target = $get_target_settings->($scfg);
return undef if !defined($volname); # nothing to search for.. return undef if !defined($volname); # nothing to search for..
foreach my $lun (@{$SETTINGS->{target}->{luns}}) { foreach my $lun (@{$target->{luns}}) {
if ($lun->{storage_object} eq "$BACKSTORE/$volname") { if ($lun->{storage_object} eq "$BACKSTORE/$volname") {
return $lun->{index}; return $lun->{index};
} }
@ -225,8 +238,9 @@ my $list_lun = sub {
my $object = $params[0]; my $object = $params[0];
my $volname = $extract_volname->($scfg, $params[0]); my $volname = $extract_volname->($scfg, $params[0]);
my $target = $get_target_settings->($scfg);
foreach my $lun (@{$SETTINGS->{target}->{luns}}) { foreach my $lun (@{$target->{luns}}) {
if ($lun->{storage_object} eq "$BACKSTORE/$volname") { if ($lun->{storage_object} eq "$BACKSTORE/$volname") {
return $object; return $object;
} }
@ -290,8 +304,9 @@ my $delete_lun = sub {
my $path = $params[0]; my $path = $params[0];
my $volname = $extract_volname->($scfg, $params[0]); my $volname = $extract_volname->($scfg, $params[0]);
my $target = $get_target_settings->($scfg);
foreach my $lun (@{$SETTINGS->{target}->{luns}}) { foreach my $lun (@{$target->{luns}}) {
next if $lun->{storage_object} ne "$BACKSTORE/$volname"; next if $lun->{storage_object} ne "$BACKSTORE/$volname";
# step 1: delete the lun # step 1: delete the lun
@ -312,7 +327,7 @@ my $delete_lun = sub {
$execute_remote_command->($scfg, $timeout, $targetcli, 'saveconfig'); $execute_remote_command->($scfg, $timeout, $targetcli, 'saveconfig');
# update interal cache # update interal cache
$free_lu_name->($volname); $free_lu_name->($scfg, $volname);
last; last;
} }
@ -354,7 +369,8 @@ sub run_lun_command {
# fetch configuration from target if we haven't yet or if it is stale # fetch configuration from target if we haven't yet or if it is stale
my $timediff = time - $SETTINGS_TIMESTAMP; my $timediff = time - $SETTINGS_TIMESTAMP;
if (!$SETTINGS || $timediff > $SETTINGS_MAXAGE) { my $target = $get_target_settings->($scfg);
if (!$target || $timediff > $SETTINGS_MAXAGE) {
$SETTINGS_TIMESTAMP = time; $SETTINGS_TIMESTAMP = time;
$parser->($scfg); $parser->($scfg);
} }