export: add missing format query call parameter

[pve-storage.git] / PVE / Storage.pm

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index ee2295a477914c3b9e2de33f5dbf2f9a6e4004fb..7a65624ee4c2d2d06db90c45ccb6dc788c700b2d 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -7,6 +7,7 @@ use Data::Dumper;
 use POSIX;
 use IO::Select;
 use IO::File;
+use IO::Socket::IP;
 use File::Basename;
 use File::Path;
 use Cwd 'abs_path';
@@ -263,20 +264,19 @@ sub volume_has_feature {
 }
 
 sub volume_snapshot_list {
-    my ($cfg, $volid, $prefix) = @_;
+    my ($cfg, $volid) = @_;
 
     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_list($scfg, $storeid, $volname, $prefix);
+       return $plugin->volume_snapshot_list($scfg, $storeid, $volname);
     } elsif ($volid =~ m|^(/.+)$| && -e $volid) {
        die "send file/device '$volid' is not possible\n";
     } else {
        die "unable to parse volume ID '$volid'\n";
     }
     # return an empty array if dataset does not exist.
-    # youngest snap first
 }
 
 sub get_image_dir {
@@ -525,7 +525,7 @@ sub abs_filesystem_path {
 }
 
 sub storage_migrate {
-    my ($cfg, $volid, $target_sshinfo, $target_storeid, $target_volname, $base_snapshot, $snapshot) = @_;
+    my ($cfg, $volid, $target_sshinfo, $target_storeid, $target_volname, $base_snapshot, $snapshot, $ratelimit_bps, $insecure) = @_;
 
     my ($storeid, $volname) = parse_volume_id($volid);
     $target_volname = $volname if !$target_volname;
@@ -539,11 +539,12 @@ sub storage_migrate {
 
     my $target_volid = "${target_storeid}:${target_volname}";
 
-    my $target_host = $target_sshinfo->{name};
-    my $errstr = "unable to migrate '$volid' to '${target_volid}' on host '$target_host'";
+    my $target_ip = $target_sshinfo->{ip};
+    my $errstr = "unable to migrate '$volid' to '${target_volid}' on host '$target_sshinfo->{name}'";
 
     my $ssh = PVE::Cluster::ssh_info_to_command($target_sshinfo);
-    local $ENV{RSYNC_RSH} = PVE::Tools::cmd2string($ssh);
+    my $ssh_base = PVE::Cluster::ssh_info_to_command_base($target_sshinfo);
+    local $ENV{RSYNC_RSH} = PVE::Tools::cmd2string($ssh_base);
 
     my $no_incremental = sub {
        my ($type) = @_;
@@ -557,6 +558,9 @@ sub storage_migrate {
            if defined($snapshot);
     };
 
+    my @cstream = ([ '/usr/bin/cstream', '-t', $ratelimit_bps ])
+       if defined($ratelimit_bps);
+
     # only implemented for file system based storage
     if ($scfg->{path}) {
        $no_incremental->($scfg->{type});
@@ -589,13 +593,16 @@ sub storage_migrate {
                }
 
                my $cmd;
+               my @bwlimit = ("--bwlimit=${ratelimit_bps}b") if defined($ratelimit_bps);
                if ($format eq 'subvol') {
                    $cmd = ['/usr/bin/rsync', '--progress', '-X', '-A', '--numeric-ids',
                            '-aH', '--delete', '--no-whole-file', '--inplace',
-                           '--one-file-system', "$src/", "[root\@${target_host}]:$dst"];
+                           '--one-file-system', @bwlimit,
+                           "$src/", "[root\@${target_ip}]:$dst"];
                } else {
                    $cmd = ['/usr/bin/rsync', '--progress', '--sparse', '--whole-file',
-                           $src, "[root\@${target_host}]:$dst"];
+                           @bwlimit,
+                           $src, "[root\@${target_ip}]:$dst"];
                }
 
                my $percent = -1;
@@ -639,8 +646,16 @@ sub storage_migrate {
            die "cannot migrate from storage type '$scfg->{type}' to '$tcfg->{type}'\n" if !@formats;
            my $format = $formats[0];
 
+           my @insecurecmd;
+           if ($insecure) {
+               @insecurecmd = ('pvecm', 'mtunnel', '-run-command', 1);
+               if (my $network = $target_sshinfo->{network}) {
+                   push @insecurecmd, '-migration_network', $network;
+               }
+           }
+
            my $send = ['pvesm', 'export', $volid, $format, '-', '-snapshot', $snapshot, '-with-snapshots', '1'];
-           my $recv = [@$ssh, '--', 'pvesm', 'import', $volid, $format, '-', '-with-snapshots', '1'];
+           my $recv = [@$ssh, @insecurecmd, '--', 'pvesm', 'import', $volid, $format, '-', '-with-snapshots', '1'];
            if ($migration_snapshot) {
                push @$recv, '-delete-snapshot', $snapshot;
            }
@@ -653,7 +668,17 @@ sub storage_migrate {
 
            volume_snapshot($cfg, $volid, $snapshot) if $migration_snapshot;
            eval {
-               run_command([$send, $recv]);
+               if ($insecure) {
+                   my $pid = open(my $info, '-|', @$recv)
+                       or die "receive command failed: $!\n";
+                   my ($ip) = <$info> =~ /^($PVE::Tools::IPRE)$/ or die "no tunnel IP received\n";
+                   my ($port) = <$info> =~ /^(\d+)$/ or die "no tunnel port received\n";
+                   my $socket = IO::Socket::IP->new(PeerHost => $ip, PeerPort => $port, Type => SOCK_STREAM)
+                       or die "failed to connect to tunnel at $ip:$port\n";
+                   run_command([$send, @cstream], output => '>&'.fileno($socket));
+               } else {
+                   run_command([$send, @cstream, $recv]);
+               }
            };
            my $err = $@;
            warn "send/receive failed, cleaning up snapshot(s)..\n" if $err;
@@ -684,11 +709,11 @@ sub storage_migrate {
 
            eval {
                if ($tcfg->{type} eq 'lvmthin') {
-                   run_command([["dd", "if=$src", "bs=4k"],[@$ssh,
-                             "dd", 'conv=sparse', "of=$dst", "bs=4k"]]);
+                   run_command([["dd", "if=$src", "bs=4k"], @cstream,
+                             [@$ssh, "dd", 'conv=sparse', "of=$dst", "bs=4k"]]);
                } else {
-                   run_command([["dd", "if=$src", "bs=4k"],[@$ssh,
-                             "dd", "of=$dst", "bs=4k"]]);
+                   run_command([["dd", "if=$src", "bs=4k"], @cstream,
+                             [@$ssh, "dd", "of=$dst", "bs=4k"]]);
                }
            };
            if (my $err = $@) {
@@ -1509,7 +1534,8 @@ sub volume_export_formats {
     my $scfg = storage_config($cfg, $storeid);
     my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
     return $plugin->volume_export_formats($scfg, $storeid, $volname,
-                                          $base_snapshot, $with_snapshots);
+                                          $snapshot, $base_snapshot,
+                                          $with_snapshots);
 }
 
 sub volume_import_formats {