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

migrate: use the correct IP with rsync

Browse Source
This commit is contained in:
Wolfgang Bumiller
2017-06-06 10:04:01 +02:00
committed by Dietmar Maurer
parent b43d0f3043
commit 4b4c580d02
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/Storage.pm
View File

@ -539,8 +539,8 @@ sub storage_migrate {
my $target_volid = "${target_storeid}:${target_volname}"; my $target_volid = "${target_storeid}:${target_volname}";
my $target_host = $target_sshinfo->{name}; my $target_ip = $target_sshinfo->{ip};
my $errstr = "unable to migrate '$volid' to '${target_volid}' on host '$target_host'"; my $errstr = "unable to migrate '$volid' to '${target_volid}' on host '$target_sshinfo->{name}'";
my $ssh = PVE::Cluster::ssh_info_to_command($target_sshinfo); my $ssh = PVE::Cluster::ssh_info_to_command($target_sshinfo);
local $ENV{RSYNC_RSH} = PVE::Tools::cmd2string($ssh); local $ENV{RSYNC_RSH} = PVE::Tools::cmd2string($ssh);
@ -597,11 +597,11 @@ sub storage_migrate {
$cmd = ['/usr/bin/rsync', '--progress', '-X', '-A', '--numeric-ids', $cmd = ['/usr/bin/rsync', '--progress', '-X', '-A', '--numeric-ids',
'-aH', '--delete', '--no-whole-file', '--inplace', '-aH', '--delete', '--no-whole-file', '--inplace',
'--one-file-system', @bwlimit, '--one-file-system', @bwlimit,
"$src/", "[root\@${target_host}]:$dst"]; "$src/", "[root\@${target_ip}]:$dst"];
} else { } else {
$cmd = ['/usr/bin/rsync', '--progress', '--sparse', '--whole-file', $cmd = ['/usr/bin/rsync', '--progress', '--sparse', '--whole-file',
@bwlimit, @bwlimit,
$src, "[root\@${target_host}]:$dst"]; $src, "[root\@${target_ip}]:$dst"];
} }
my $percent = -1; my $percent = -1;