use POSIX;
use IO::Select;
use IO::File;
+use IO::Socket::IP;
use File::Basename;
use File::Path;
use Cwd 'abs_path';
}
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 {
}
sub storage_migrate {
- my ($cfg, $volid, $target_host, $target_storeid, $target_volname) = @_;
+ 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;
my $target_volid = "${target_storeid}:${target_volname}";
- 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 $sshoptions = "-o 'BatchMode=yes'";
- my $ssh = "/usr/bin/ssh $sshoptions";
+ my $ssh = PVE::Cluster::ssh_info_to_command($target_sshinfo);
+ my $ssh_base = PVE::Cluster::ssh_info_to_command_base($target_sshinfo);
+ local $ENV{RSYNC_RSH} = PVE::Tools::cmd2string($ssh_base);
- local $ENV{RSYNC_RSH} = $ssh;
+ my $no_incremental = sub {
+ my ($type) = @_;
+ die "incremental migration not supported on storage type $type\n"
+ if defined($base_snapshot);
+ };
+ my $no_snapshot = sub {
+ my ($type) = @_;
+ # $snapshot is currently only used by replication
+ die "replicating storage migration not supported on storage type $type\n"
+ 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}) {
- if ($tcfg->{path}) {
+ $no_incremental->($scfg->{type});
+ $no_snapshot->($scfg->{type});
+ if ($tcfg->{path}) {
my $src_plugin = PVE::Storage::Plugin->lookup($scfg->{type});
my $dst_plugin = PVE::Storage::Plugin->lookup($tcfg->{type});
my $src = $src_plugin->path($scfg, $volname, $storeid);
run_command(['/bin/cp', $src, $dst]);
} else {
- run_command(['/usr/bin/ssh', "root\@${target_host}",
- '/bin/mkdir', '-p', $dirname]);
+ run_command([@$ssh, '/bin/mkdir', '-p', $dirname]);
# we use rsync with --sparse, so we can't use --inplace,
# so we remove file on the target if it already exists to
# save space
my ($size, $format) = PVE::Storage::Plugin::file_size_info($src);
if ($format && ($format eq 'raw') && $size) {
- run_command(['/usr/bin/ssh', "root\@${target_host}",
- 'rm', '-f', $dst],
+ run_command([@$ssh, 'rm', '-f', $dst],
outfunc => sub {});
}
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;
die "$errstr - pool on target does not have the same name as on source!"
if $tcfg->{pool} ne $scfg->{pool};
+ my $migration_snapshot;
+ if (!defined($snapshot)) {
+ $migration_snapshot = 1;
+ $snapshot = '__migration__';
+ }
+
my (undef, $volname) = parse_volname($cfg, $volid);
my $zfspath = "$scfg->{pool}\/$volname";
- my $send = ['pvesm', 'export', $volid, 'zfs', '-', '-snapshot', '__migration__', '-with-snapshots', '1'];
- my $recv = ['ssh', "root\@$target_host", '--', 'pvesm', 'import', $volid, 'zfs', '-', '-with-snapshots', '1'];
- my $free = ['ssh', "root\@$target_host", '--', 'pvesm', 'free', $volid, '-snapshot', '__migration__'];
+ my @formats = volume_transfer_formats($cfg, $volid, $volid, $snapshot, $base_snapshot, 1);
+ die "cannot migrate from storage type '$scfg->{type}' to '$tcfg->{type}'\n" if !@formats;
+ my $format = $formats[0];
- volume_snapshot($cfg, $volid, '__migration__');
- eval{
- run_command([$send, $recv]);
+ 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, @insecurecmd, '--', 'pvesm', 'import', $volid, $format, '-', '-with-snapshots', '1'];
+ if ($migration_snapshot) {
+ push @$recv, '-delete-snapshot', $snapshot;
+ }
+
+ if (defined($base_snapshot)) {
+ # Check if the snapshot exists on the remote side:
+ push @$send, '-base', $base_snapshot;
+ push @$recv, '-base', $base_snapshot;
+ }
+
+ volume_snapshot($cfg, $volid, $snapshot) if $migration_snapshot;
+ eval {
+ if ($insecure) {
+ my $pid = open(my $info, '-|', @$recv)
+ or die "receive command failed: $!\n";
+ my $ip = <$info> // die "no tunnel IP received\n";
+ my $port = <$info> // die "no tunnel port received\n";
+ chomp($ip, $port);
+ 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;
- eval { volume_snapshot_delete($cfg, $volid, '__migration__', 0) };
- warn "could not remove source snapshot: $@\n" if $@;
- eval { run_command($free) };
- warn "could not remove target snapshot: $@\n" if $@;
+ if ($migration_snapshot) {
+ eval { volume_snapshot_delete($cfg, $volid, $snapshot, 0) };
+ warn "could not remove source snapshot: $@\n" if $@;
+ }
die $err if $err;
} else {
die "$errstr - target type $tcfg->{type} is not valid\n";
}
} elsif ($scfg->{type} eq 'lvmthin' || $scfg->{type} eq 'lvm') {
+ $no_incremental->($scfg->{type});
+ $no_snapshot->($scfg->{type});
if (($scfg->{type} eq $tcfg->{type}) &&
($tcfg->{type} eq 'lvmthin' || $tcfg->{type} eq 'lvm')) {
my $src = path($cfg, $volid);
my $dst = path($cfg, $target_volid);
- run_command(['/usr/bin/ssh', "root\@${target_host}",
+ run_command([@$ssh, '--',
'pvesm', 'alloc', $target_storeid, $vmid,
$target_volname, int($size/1024)]);
eval {
if ($tcfg->{type} eq 'lvmthin') {
- run_command([["dd", "if=$src", "bs=4k"],["/usr/bin/ssh", "root\@${target_host}",
- "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"],["/usr/bin/ssh", "root\@${target_host}",
- "dd", "of=$dst", "bs=4k"]]);
+ run_command([["dd", "if=$src", "bs=4k"], @cstream,
+ [@$ssh, "dd", "of=$dst", "bs=4k"]]);
}
};
if (my $err = $@) {
- run_command(['/usr/bin/ssh', "root\@${target_host}",
- 'pvesm', 'free', $target_volid]);
+ run_command([@$ssh, 'pvesm', 'free', $target_volid]);
die $err;
}
} else {
$base_snapshot, $with_snapshots);
}
+sub volume_export_formats {
+ my ($cfg, $volid, $snapshot, $base_snapshot, $with_snapshots) = @_;
+
+ my ($storeid, $volname) = parse_volume_id($volid, 1);
+ return if !$storeid;
+ 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);
+}
+
+sub volume_import_formats {
+ my ($cfg, $volid, $base_snapshot, $with_snapshots) = @_;
+
+ my ($storeid, $volname) = parse_volume_id($volid, 1);
+ return if !$storeid;
+ my $scfg = storage_config($cfg, $storeid);
+ my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+ return $plugin->volume_import_formats($scfg, $storeid, $volname,
+ $base_snapshot, $with_snapshots);
+}
+
+sub volume_transfer_formats {
+ my ($cfg, $src_volid, $dst_volid, $snapshot, $base_snapshot, $with_snapshots) = @_;
+ my @export_formats = volume_export_formats($cfg, $src_volid, $snapshot, $base_snapshot, $with_snapshots);
+ my @import_formats = volume_import_formats($cfg, $dst_volid, $base_snapshot, $with_snapshots);
+ my %import_hash = map { $_ => 1 } @import_formats;
+ my @common = grep { $import_hash{$_} } @export_formats;
+ return @common;
+}
+
# bash completion helper
sub complete_storage {
projects / pve-storage.git / blobdiff