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

Revert "Add function volume_snapshot_delete_remote."

Browse Source 
This reverts commit 4bd0b38f53.
This commit is contained in:
Dietmar Maurer
2017-05-10 06:55:00 +02:00
parent 68c2c2fc62
commit 889d7485cb
3 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PVE/Storage.pm
View File

@ -251,21 +251,6 @@ sub volume_snapshot_rollback {
}
}
sub volume_snapshot_delete_remote {
my ($cfg, $volid, $snap, $ip) = @_;
my ($storeid, $volname) = parse_volume_id($volid, 1);
if ($storeid) {
my $scfg = storage_config($cfg, $storeid);
my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
return $plugin->volume_snapshot_delete_remote($scfg, $storeid, $volname, $snap, $ip);
} elsif ($volid =~ m|^(/.+)$| && -e $volid) {
die "snapshot delete file/device '$volid' is not possible\n";
} else {
die "unable to parse volume ID '$volid'\n";
}
}
sub volume_snapshot_delete {
my ($cfg, $volid, $snap, $running) = @_;

7
PVE/Storage/Plugin.pm
View File

@ -725,13 +725,6 @@ sub volume_snapshot_rollback {
return undef;
}
sub volume_snapshot_delete_remote {
my ($class, $scfg, $storeid, $volname, $snap, $ip) = @_;
# implement in subclass
die "Volume_snapshot_delete_remote is not implemented for $class";
}
sub volume_snapshot_delete {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;

13
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -180,10 +180,7 @@ sub zfs_request {
}
push @$cmd, @params;
if ($ip) {
$ip = "[$ip]" if Net::IP::ip_is_ipv6($ip);
unshift @$cmd, 'ssh', '-o', 'BatchMode=yes', "root\@${ip}", '--';
}
my $msg = '';
my $output = sub {
@ -520,20 +517,12 @@ sub volume_send {
}
}
sub volume_snapshot_delete_remote {
my ($class, $scfg, $storeid, $volname, $snap, $ip) = @_;
my $vname = ($class->parse_volname($volname))[1];
$class->zfs_request($scfg, $ip, undef, 'destroy', "$scfg->{pool}/$vname\@$snap");
}
sub volume_snapshot_delete {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my $vname = ($class->parse_volname($volname))[1];
$class->deactivate_volume($storeid, $scfg, $vname, $snap, {});
$class->zfs_request($scfg, undef, undef, 'destroy', "$scfg->{pool}/$vname\@$snap");
}