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

volume_snapshot_list: remove $ip parameter

Browse Source 
We want to handle ssh connections somewhere else (not inside the
storage plugins).
This commit is contained in:
Dietmar Maurer
2017-05-10 07:02:42 +02:00
parent 3d4949692a
commit 17be2e9a0c
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/Storage.pm
View File

@ -264,13 +264,13 @@ sub volume_has_feature {
} }
sub volume_snapshot_list { sub volume_snapshot_list {
my ($cfg, $volid, $prefix, $ip) = @_; my ($cfg, $volid, $prefix) = @_;
my ($storeid, $volname) = parse_volume_id($volid, 1); my ($storeid, $volname) = parse_volume_id($volid, 1);
if ($storeid) { if ($storeid) {
my $scfg = storage_config($cfg, $storeid); my $scfg = storage_config($cfg, $storeid);
my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
return $plugin->volume_snapshot_list($scfg, $storeid, $volname, $prefix, $ip); return $plugin->volume_snapshot_list($scfg, $storeid, $volname, $prefix);
} elsif ($volid =~ m|^(/.+)$| && -e $volid) { } elsif ($volid =~ m|^(/.+)$| && -e $volid) {
die "send file/device '$volid' is not possible\n"; die "send file/device '$volid' is not possible\n";
} else { } else {

2
PVE/Storage/Plugin.pm
View File

@ -825,7 +825,7 @@ sub status {
} }
sub volume_snapshot_list { sub volume_snapshot_list {
my ($class, $scfg, $storeid, $volname, $prefix, $ip) = @_; my ($class, $scfg, $storeid, $volname, $prefix) = @_;
# implement in subclass # implement in subclass
die "Volume_snapshot_list is not implemented for $class"; die "Volume_snapshot_list is not implemented for $class";

2
PVE/Storage/ZFSPlugin.pm
View File

@ -363,7 +363,7 @@ sub volume_has_feature {
} }
sub volume_snapshot_list { sub volume_snapshot_list {
my ($class, $scfg, $storeid, $volname, $prefix, $ip) = @_; my ($class, $scfg, $storeid, $volname, $prefix) = @_;
# return an empty array if dataset does not exist. # return an empty array if dataset does not exist.
die "Volume_snapshot_list is not implemented for ZFS over iSCSI.\n"; die "Volume_snapshot_list is not implemented for ZFS over iSCSI.\n";
} }

7
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -495,7 +495,7 @@ sub volume_rollback_is_possible {
} }
sub volume_snapshot_list { sub volume_snapshot_list {
my ($class, $scfg, $storeid, $volname, $prefix, $ip) = @_; my ($class, $scfg, $storeid, $volname, $prefix) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname); my ($vtype, $name, $vmid) = $class->parse_volname($volname);
@ -507,11 +507,6 @@ sub volume_snapshot_list {
my $cmd = ['zfs', 'list', '-r', '-H', '-S', 'name', '-t', 'snap', '-o', my $cmd = ['zfs', 'list', '-r', '-H', '-S', 'name', '-t', 'snap', '-o',
'name', $zpath]; 'name', $zpath];
if ($ip) {
$ip = "[$ip]" if Net::IP::ip_is_ipv6($ip);
unshift @$cmd, 'ssh', '-o', ' BatchMode=yes', "root\@${ip}", '--';
}
my $outfunc = sub { my $outfunc = sub {
my $line = shift; my $line = shift;