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

zpool: cleanup zfs_request command a bit

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2019-04-17 14:31:05 +00:00
parent dc18abe07b
commit a10695b4e8
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -167,8 +167,6 @@ sub path {
sub zfs_request { sub zfs_request {
my ($class, $scfg, $timeout, $method, @params) = @_; my ($class, $scfg, $timeout, $method, @params) = @_;
my $default_timeout = PVE::RPCEnvironment->is_worker() ? 60*60 : 5;
my $cmd = []; my $cmd = [];
if ($method eq 'zpool_list') { if ($method eq 'zpool_list') {
@ -179,17 +177,12 @@ sub zfs_request {
} else { } else {
push @$cmd, 'zfs', $method; push @$cmd, 'zfs', $method;
} }
push @$cmd, @params; push @$cmd, @params;
my $msg = ''; my $msg = '';
my $output = sub { $msg .= "$_[0]\n" };
my $output = sub { $timeout = PVE::RPCEnvironment->is_worker() ? 60*60 : 5 if !$timeout;
my $line = shift;
$msg .= "$line\n";
};
$timeout = $default_timeout if !$timeout;
run_command($cmd, errmsg => "zfs error", outfunc => $output, timeout => $timeout); run_command($cmd, errmsg => "zfs error", outfunc => $output, timeout => $timeout);