Use is_worker to decide default timeout for ZFS

Bump timeout to 1 hour if running in a worker and no timeout
specified.
This commit is contained in:
Fabian Grünbichler
2016-03-15 14:01:11 +01:00
committed by Dietmar Maurer
parent 785e544c7f
commit 21430e5088
2 changed files with 7 additions and 3 deletions

View File

@ -6,7 +6,7 @@ use IO::File;
use POSIX;
use PVE::Tools qw(run_command);
use PVE::Storage::Plugin;
use PVE::RPCEnvironment;
use base qw(PVE::Storage::Plugin);
@ -164,7 +164,8 @@ sub path {
sub zfs_request {
my ($class, $scfg, $timeout, $method, @params) = @_;
$timeout = 5 if !$timeout;
$timeout = PVE::RPCEnvironment::is_worker() ? 60*60 : 5
if !$timeout;
my $cmd = [];