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

Revert "Include new storage function volume_send."

Browse Source 
This reverts commit b76774e57f.
This commit is contained in:
Dietmar Maurer
2017-05-10 06:58:44 +02:00
parent 44257d2e38
commit 3d4949692a
4 changed files with 0 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -466,58 +466,6 @@ sub volume_snapshot {
$class->zfs_request($scfg, undef, 'snapshot', "$scfg->{pool}/$vname\@$snap");
}
sub volume_send {
my ($class, $scfg, $storeid, $volname, $ip, $snap,
$incremental_snap, $verbose, $limit, $target_path) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $zpath = "$scfg->{pool}/$name";
die "$vtype is not allowed in ZFSPool!" if ($vtype ne "images");
my $cmdsend = [];
my $cmdlimit = [];
push @$cmdsend, 'zfs', 'send', '-R';
push @$cmdsend, '-v' if defined($verbose);
if( defined($incremental_snap)) {
push @$cmdsend, '-I', "$zpath\@${incremental_snap}";
}
push @$cmdsend, '--', "$zpath\@${snap}";
# limit in kByte/s
if ($limit){
my $bwl = $limit * 1024;
push @$cmdlimit, 'cstream', '-t', $bwl;
}
my $cmdrecv = [];
if ($ip) {
$ip = "[$ip]" if Net::IP::ip_is_ipv6($ip);
push @$cmdrecv, 'ssh', '-o', 'BatchMode=yes', "root\@${ip}", '--';
}
push @$cmdrecv, 'zfs', 'recv', '-F', '--';
$zpath = $target_path if defined($target_path);
push @$cmdrecv, $zpath;
if ($limit) {
eval { run_command([$cmdsend, $cmdlimit, $cmdrecv]) };
} else {
eval { run_command([$cmdsend, $cmdrecv]) };
}
if (my $err = $@) {
die $err;
}
}
sub volume_snapshot_delete {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;