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

ZFSPoolPlugin: use udevadm settle with --exit-if-exists

Browse Source 
And silently ignore error if that command fails.
This commit is contained in:
Dietmar Maurer
2015-02-12 11:40:55 +01:00
parent f824c72250
commit 76fd7dc7c2
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -180,13 +180,11 @@ sub alloc_image {
$name = $class->zfs_find_free_diskname($storeid, $scfg, $vmid) if !$name; $name = $class->zfs_find_free_diskname($storeid, $scfg, $vmid) if !$name;
$class->zfs_create_zvol($scfg, $name, $size); $class->zfs_create_zvol($scfg, $name, $size);
run_command ("udevadm trigger --subsystem-match block");
run_command ("udevadm settle --timeout 5"); my $devname = "/dev/zvol/$scfg->{pool}/$name";
for (1..10) { run_command("udevadm trigger --subsystem-match block");
last if -e "/dev/zvol/$scfg->{pool}/$name" ; system("udevadm settle --timeout 10 --exit-if-exists=${devname}");
Time::HiRes::usleep(100);
}
return $name; return $name;
} }