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

zpool: handle race with other zpool imports

Browse Source 
The underlying issue is that a zpool can get imported only once, so
we first check if it's in `zpool list`, and thus imported, and only
if it does not shows up there we try to import it.

But, this can race with either:
* parallel running activate_storage call, through CLI/API/daemon
* a zpool import from an admin (a bit unlikely, but hey that's the
  thing with race conditions ;))

So refactor the "is pool imported" check into a closure, and call it
addditionally if the import failed, and silent the error if the pool
is now listed, and thus imported. This makes it a little bit nicer to
read too, IMO.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2019-04-17 15:00:20 +00:00
committed by Fabian Grünbichler
parent 1187d22d28
commit b5c8278a3e
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -516,20 +516,23 @@ sub activate_storage {
my $pool = $scfg->{pool};
$pool =~ s!/.*$!!;
my @param = ('-o', 'name', '-H', "$pool");
my $res;
eval {
$res = $class->zfs_request($scfg, undef, 'zpool_list', @param);
};
my $err = $@;
if ($err || !defined($res) || $res !~ $pool) {
eval {
@param = ('-d', '/dev/disk/by-id/', '-o', 'cachefile=none', "$pool");
$class->zfs_request($scfg, undef, 'zpool_import', @param);
};
my $pool_imported = sub {
my @param = ('-o', 'name', '-H', "$pool");
my $res = eval { $class->zfs_request($scfg, undef, 'zpool_list', @param) };
if ($@) {
warn "$err\n";
die "could not activate storage '$storeid', $@\n";
warn "$@\n";
return undef;
}
return defined($res) && $res =~ m/$pool/;
};
if (!$pool_imported->()) {
# import can only be done if not yet imported!
my @param = ('-d', '/dev/disk/by-id/', '-o', 'cachefile=none', "$pool");
eval { $class->zfs_request($scfg, undef, 'zpool_import', @param) };
if (my $err = $@) {
# just could've raced with another import, so recheck if it is imported
die "could not activate storage '$storeid', $@\n" if !$pool_imported->();
}
}
return 1;