Proxmox/pve-storage
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-01-11 05:18:01 +03:00
Code Releases Activity

zpool: activate: move mount check out and make program flow easier

Browse Source 
Early return when mounted heuristics returns true, that allows to get
rid of an indentation level.

Moving the heuristic out makes the activate method smaller and easier
to grasp

Best viewed with ignoring whitespace changes (`git show -w`).

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-02-19 15:21:16 +01:00
parent 9440330aba
commit 26de022b56
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -522,6 +522,21 @@ sub volume_snapshot_list {
return $snaps; return $snaps;
} }
my sub dataset_mounted_heuristic {
my ($dataset) = @_;
my $mounts = PVE::ProcFSTools::parse_proc_mounts();
for my $mp (@$mounts) {
my ($what, $dir, $fs) = $mp->@*;
next if $fs ne 'zfs';
# check for root-dataset or any child-dataset (root-dataset could have 'canmount=off')
# If any child is mounted heuristically assume that `zfs mount -a` was successful
next if $what !~ m!^$dataset(?:/|$)!;
return 1;
}
return 0;
}
sub activate_storage { sub activate_storage {
my ($class, $storeid, $scfg, $cache) = @_; my ($class, $storeid, $scfg, $cache) = @_;
@ -529,19 +544,7 @@ sub activate_storage {
my $dataset = $scfg->{pool}; my $dataset = $scfg->{pool};
my $pool = ($dataset =~ s!/.*$!!r); my $pool = ($dataset =~ s!/.*$!!r);
my $dataset_mounted = sub { return 1 if dataset_mounted_heuristic($dataset); # early return
my $mounts = PVE::ProcFSTools::parse_proc_mounts();
foreach my $mp (@$mounts) {
my ($what, $dir, $fs) = @$mp;
next if $fs ne 'zfs';
# check for root-dataset of storage or any child-dataset.
# root-dataset could have 'canmount=off'. If any child is mounted
# heuristically assume that `zfs mount -a` was successful
next if $what !~ m!^$dataset(?:/|$)!;
return 1;
}
return 0;
};
my $pool_imported = sub { my $pool_imported = sub {
my @param = ('-o', 'name', '-H', $pool); my @param = ('-o', 'name', '-H', $pool);
@ -551,19 +554,17 @@ sub activate_storage {
return defined($res) && $res =~ m/$pool/; return defined($res) && $res =~ m/$pool/;
}; };
if (!$dataset_mounted->()) { if (!$pool_imported->()) {
if (!$pool_imported->()) { # import can only be done if not yet imported!
# import can only be done if not yet imported! my @param = ('-d', '/dev/disk/by-id/', '-o', 'cachefile=none', $pool);
my @param = ('-d', '/dev/disk/by-id/', '-o', 'cachefile=none', $pool); eval { $class->zfs_request($scfg, undef, 'zpool_import', @param) };
eval { $class->zfs_request($scfg, undef, 'zpool_import', @param) }; if (my $err = $@) {
if (my $err = $@) { # just could've raced with another import, so recheck if it is imported
# just could've raced with another import, so recheck if it is imported die "could not activate storage '$storeid', $err\n" if !$pool_imported->();
die "could not activate storage '$storeid', $err\n" if !$pool_imported->();
}
} }
eval { $class->zfs_request($scfg, undef, 'mount', '-a') };
die "could not activate storage '$storeid', $@\n" if $@;
} }
eval { $class->zfs_request($scfg, undef, 'mount', '-a') };
die "could not activate storage '$storeid', $@\n" if $@;
return 1; return 1;
} }