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

zfs: cleanup zfs_request

Browse Source
This commit is contained in:
Dietmar Maurer
2015-01-22 09:37:52 +01:00
parent 7730694e54
commit e8004c9cb7
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
PVE/Storage/ZFSPlugin.pm
View File

@ -49,13 +49,10 @@ my $zfs_get_base = sub {
sub zfs_request { sub zfs_request {
my ($class, $scfg, $timeout, $method, @params) = @_; my ($class, $scfg, $timeout, $method, @params) = @_;
my $cmdmap;
my $zfscmd;
my $target;
my $msg;
$timeout = 5 if !$timeout; $timeout = 5 if !$timeout;
my $msg = '';
if ($lun_cmds->{$method}) { if ($lun_cmds->{$method}) {
if ($scfg->{iscsiprovider} eq 'comstar') { if ($scfg->{iscsiprovider} eq 'comstar') {
$msg = PVE::Storage::LunCmd::Comstar::run_lun_command($scfg, $timeout, $method, @params); $msg = PVE::Storage::LunCmd::Comstar::run_lun_command($scfg, $timeout, $method, @params);
@ -67,22 +64,22 @@ sub zfs_request {
$zfs_unknown_scsi_provider->($scfg->{iscsiprovider}); $zfs_unknown_scsi_provider->($scfg->{iscsiprovider});
} }
} else { } else {
my $target = 'root@' . $scfg->{portal};
my $cmd = [@ssh_cmd, '-i', "$id_rsa_path/$scfg->{portal}_id_rsa", $target];
if ($method eq 'zpool_list') { if ($method eq 'zpool_list') {
$zfscmd = 'zpool'; push @$cmd, 'zpool', 'list';
$method = 'list', } else {
} else { push @$cmd, 'zfs', $method;
$zfscmd = 'zfs';
} }
$target = 'root@' . $scfg->{portal}; push @$cmd, @params;
my $cmd = [@ssh_cmd, '-i', "$id_rsa_path/$scfg->{portal}_id_rsa", $target, $zfscmd, $method, @params]; my $output = sub {
my $line = shift;
$msg = ''; $msg .= "$line\n";
my $output = sub {
my $line = shift;
$msg .= "$line\n";
}; };
run_command($cmd, outfunc => $output, timeout => $timeout); run_command($cmd, outfunc => $output, timeout => $timeout);