proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-06 06:01:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migration: fix false-positive log for copying local images

Browse Source 
Only log that if we actually have local disks.
Add also an explicit log for replication.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-11-20 16:01:33 +01:00
parent 5084a85941
commit e85d01f282
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PVE/QemuMigrate.pm
View File

@ -436,21 +436,18 @@ sub sync_disks {
}
}
my $rep_volumes;
$self->log('info', "copying disk images");
my $rep_cfg = PVE::ReplicationConfig->new();
if (my $jobcfg = $rep_cfg->find_local_replication_job($vmid, $self->{node})) {
die "can't live migrate VM with replicated volumes\n" if $self->{running};
$self->log('info', "replicating disk images");
my $start_time = time();
my $logfunc = sub { my ($msg) = @_; $self->log('info', $msg); };
$rep_volumes = PVE::Replication::run_replication(
my $logfunc = sub { $self->log('info', shift) };
$self->{replicated_volumes} = PVE::Replication::run_replication(
'PVE::QemuConfig', $jobcfg, $start_time, $start_time, $logfunc);
$self->{replicated_volumes} = $rep_volumes;
}
$self->log('info', "copying local disk images") if scalar(%$local_volumes);
foreach my $volid (keys %$local_volumes) {
my ($sid, $volname) = PVE::Storage::parse_volume_id($volid);
my $targetsid = $override_targetsid // $sid;
@ -463,7 +460,7 @@ sub sync_disks {
push @{$self->{volumes}}, $volid;
next;
} else {
next if $rep_volumes->{$volid};
next if $self->{replicated_volumes}->{$volid};
push @{$self->{volumes}}, $volid;
my $opts = $self->{opts};
my $insecure = $opts->{migration_type} eq 'insecure';