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

Use is_worker to decide default timeout for ZFS

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/Storage/ZFSPlugin.pm
View File

@ -6,12 +6,14 @@ use IO::File;
use POSIX; use POSIX;
use PVE::Tools qw(run_command); use PVE::Tools qw(run_command);
use PVE::Storage::ZFSPoolPlugin; use PVE::Storage::ZFSPoolPlugin;
use PVE::RPCEnvironment;
use base qw(PVE::Storage::ZFSPoolPlugin); use base qw(PVE::Storage::ZFSPoolPlugin);
use PVE::Storage::LunCmd::Comstar; use PVE::Storage::LunCmd::Comstar;
use PVE::Storage::LunCmd::Istgt; use PVE::Storage::LunCmd::Istgt;
use PVE::Storage::LunCmd::Iet; use PVE::Storage::LunCmd::Iet;
my @ssh_opts = ('-o', 'BatchMode=yes'); my @ssh_opts = ('-o', 'BatchMode=yes');
my @ssh_cmd = ('/usr/bin/ssh', @ssh_opts); my @ssh_cmd = ('/usr/bin/ssh', @ssh_opts);
my $id_rsa_path = '/etc/pve/priv/zfs'; my $id_rsa_path = '/etc/pve/priv/zfs';
@ -49,7 +51,8 @@ my $zfs_get_base = sub {
sub zfs_request { sub zfs_request {
my ($class, $scfg, $timeout, $method, @params) = @_; my ($class, $scfg, $timeout, $method, @params) = @_;
$timeout = 10 if !$timeout; $timeout = PVE::RPCEnvironment::is_worker() ? 60*60 : 10
if !$timeout;
my $msg = ''; my $msg = '';

5
PVE/Storage/ZFSPoolPlugin.pm
View File

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