proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-03 10:29:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #2100: ignore cloudinit drive on offline migration

Browse Source 
disk is not copied to the target node but still deleted on cleanup
(phase3_cleanup).

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
Tested-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Mira Limbeck 2019-03-29 16:32:04 +01:00 committed by Thomas Lamprecht
parent 7e8ab2a9ab
commit 9e93a63fe4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/QemuMigrate.pm
View File

@ -246,6 +246,7 @@ sub prepare {
if !$plugin->check_connection($sid, $scfg); if !$plugin->check_connection($sid, $scfg);
} else { } else {
# only activate if not shared # only activate if not shared
next if ($volid =~ m/vm-\d+-cloudinit/);
push @$need_activate, $volid; push @$need_activate, $volid;
} }
} }
@ -353,7 +354,13 @@ sub sync_disks {
$local_volumes->{$volid}->{ref} = $attr->{referenced_in_config} ? 'config' : 'snapshot'; $local_volumes->{$volid}->{ref} = $attr->{referenced_in_config} ? 'config' : 'snapshot';
die "local cdrom image\n" if $attr->{cdrom}; if ($attr->{cdrom}) {
if ($volid =~ /vm-\d+-cloudinit/) {
$local_volumes->{$volid}->{ref} = 'generated';
return;
}
die "local cdrom image\n";
}
my ($path, $owner) = PVE::Storage::path($self->{storecfg}, $volid); my ($path, $owner) = PVE::Storage::path($self->{storecfg}, $volid);
@ -394,6 +401,8 @@ sub sync_disks {
$self->log('info', "found local disk '$vol' (in current VM config)\n"); $self->log('info', "found local disk '$vol' (in current VM config)\n");
} elsif ($ref eq 'snapshot') { } elsif ($ref eq 'snapshot') {
$self->log('info', "found local disk '$vol' (referenced by snapshot(s))\n"); $self->log('info', "found local disk '$vol' (referenced by snapshot(s))\n");
} elsif ($ref eq 'generated') {
$self->log('info', "found generated disk '$vol' (in current VM config)\n");
} else { } else {
$self->log('info', "found local disk '$vol'\n"); $self->log('info', "found local disk '$vol'\n");
} }
@ -445,8 +454,13 @@ sub sync_disks {
foreach my $volid (keys %$local_volumes) { foreach my $volid (keys %$local_volumes) {
my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); my ($sid, $volname) = PVE::Storage::parse_volume_id($volid);
my $targetsid = $override_targetsid // $sid; my $targetsid = $override_targetsid // $sid;
if ($self->{running} && $local_volumes->{$volid}->{ref} eq 'config') { my $ref = $local_volumes->{$volid}->{ref};
if ($self->{running} && $ref eq 'config') {
push @{$self->{online_local_volumes}}, $volid; push @{$self->{online_local_volumes}}, $volid;
} elsif ($ref eq 'generated') {
# skip all generated volumes but queue them for deletion in phase3_cleanup
push @{$self->{volumes}}, $volid;
next;
} else { } else {
next if $rep_volumes->{$volid}; next if $rep_volumes->{$volid};
push @{$self->{volumes}}, $volid; push @{$self->{volumes}}, $volid;