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

migration: cleanup_remotedisks: simplify and include more disks

Browse Source 
Namely, those migrated with storage_migrate by using the information from
volume_map. Call cleanup_remotedisks in phase1_cleanup as well, because that's
where we end if sync_offline_local_volumes fails, and some disks might already
have been transfered successfully. Note that the local disks are still here, so
this is fine.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-01-29 16:11:39 +01:00 committed by Thomas Lamprecht
parent ad8b9d5e2d
commit eb5751ba02
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PVE/QemuMigrate.pm
View File

@ -695,16 +695,11 @@ sub sync_offline_local_volumes {
sub cleanup_remotedisks { sub cleanup_remotedisks {
my ($self) = @_; my ($self) = @_;
foreach my $target_drive (keys %{$self->{target_drive}}) { foreach my $volid (values %{$self->{volume_map}}) {
my $drivestr = $self->{target_drive}->{$target_drive}->{drivestr};
next if !defined($drivestr);
my $drive = PVE::QemuServer::parse_drive($target_drive, $drivestr);
# don't clean up replicated disks! # don't clean up replicated disks!
next if defined($self->{replicated_volumes}->{$drive->{file}}); next if defined($self->{replicated_volumes}->{$volid});
my ($storeid, $volname) = PVE::Storage::parse_volume_id($drive->{file}); my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid);
my $cmd = [@{$self->{rem_ssh}}, 'pvesm', 'free', "$storeid:$volname"]; my $cmd = [@{$self->{rem_ssh}}, 'pvesm', 'free', "$storeid:$volname"];
@ -759,20 +754,15 @@ sub phase1_cleanup {
$self->log('err', $err); $self->log('err', $err);
} }
my @volids = $self->filter_local_volumes('offline'); eval { $self->cleanup_remotedisks() };
if (scalar(@volids)) { if (my $err = $@) {
foreach my $volid (@volids) { $self->log('err', $err);
next if defined($self->{replicated_volumes}->{$volid});
$self->log('err', "found stale volume copy '$volid' on node '$self->{node}'");
# fixme: try to remove ?
}
} }
eval { $self->cleanup_bitmaps() }; eval { $self->cleanup_bitmaps() };
if (my $err =$@) { if (my $err =$@) {
$self->log('err', $err); $self->log('err', $err);
} }
} }
sub phase2 { sub phase2 {

5
test/run_qemu_migrate_tests.pl
View File

@ -1465,7 +1465,6 @@ my $tests = [
}, },
}, },
{ {
# FIXME also cleanup remote disks when failing this early
name => '149_storage_migrate_fail', name => '149_storage_migrate_fail',
target => 'pve1', target => 'pve1',
vmid => 149, vmid => 149,
@ -1482,9 +1481,7 @@ my $tests = [
expect_die => "storage_migrate 'local-lvm:vm-149-disk-0' error", expect_die => "storage_migrate 'local-lvm:vm-149-disk-0' error",
expected => { expected => {
source_volids => local_volids_for_vm(149), source_volids => local_volids_for_vm(149),
target_volids => { target_volids => {},
'local-dir:149/vm-149-disk-0.qcow2' => 1,
},
vm_config => $vm_configs->{149}, vm_config => $vm_configs->{149},
vm_status => { vm_status => {
running => 0, running => 0,