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

increase default timeout for zpool import

Browse Source 
as zpool import can easily take longer than 5 seconds on
systems with lots of disks
This commit is contained in:
Fabian Grünbichler
2016-11-25 10:29:23 +01:00
committed by Dietmar Maurer
parent e2e6380112
commit 72bdeea1bf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -165,8 +165,7 @@ sub path {
sub zfs_request {
my ($class, $scfg, $timeout, $method, @params) = @_;
$timeout = PVE::RPCEnvironment::is_worker() ? 60*60 : 5
if !$timeout;
my $default_timeout = PVE::RPCEnvironment::is_worker() ? 60*60 : 5;
my $cmd = [];
@ -174,6 +173,7 @@ sub zfs_request {
push @$cmd, 'zpool', 'list';
} elsif ($method eq 'zpool_import') {
push @$cmd, 'zpool', 'import';
$default_timeout = 15 if $default_timeout < 15;
} else {
push @$cmd, 'zfs', $method;
}
@ -187,6 +187,8 @@ sub zfs_request {
$msg .= "$line\n";
};
$timeout = $default_timeout if !$timeout;
run_command($cmd, errmsg => "zfs error", outfunc => $output, timeout => $timeout);
return $msg;