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

migrate: call vm_stop_cleanup after stopping in phase3_cleanup

Browse Source 
we currently only call deactivate_volumes, but we actually want to call
the whole vm_stop_cleanup, since that is not invoked by the vm_stop
above (we cannot parse the config anymore) and might do other cleanups
we also want to do (like mdev cleanup).

For this to work properly we have to clone the original config at the
beginning, since we might modify the volids.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2025-02-13 14:17:01 +01:00 committed by Fiona Ebner
parent 21cacf5c92
commit dfc47f7da2
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/QemuMigrate.pm
View File

@ -5,6 +5,7 @@ use warnings;
use IO::File;
use IPC::Open2;
use Storable qw(dclone);
use Time::HiRes qw( usleep );
use PVE::AccessControl;
@ -1457,7 +1458,8 @@ sub phase3_cleanup {
my $tunnel = $self->{tunnel};
my $sourcevollist = PVE::QemuServer::get_vm_volumes($conf);
# we'll need an unmodified copy of the config later for the cleanup
my $oldconf = dclone($conf);
if ($self->{volume_map} && !$self->{opts}->{remote}) {
my $target_drives = $self->{target_drive};
@ -1588,12 +1590,10 @@ sub phase3_cleanup {
$self->{errors} = 1;
}
# always deactivate volumes - avoid lvm LVs to be active on several nodes
eval {
PVE::Storage::deactivate_volumes($self->{storecfg}, $sourcevollist);
};
# stop with nocheck does not do a cleanup, so do it here with the original config
eval { PVE::QemuServer::vm_stop_cleanup($self->{storecfg}, $vmid, $oldconf) };
if (my $err = $@) {
$self->log('err', $err);
$self->log('err', "Cleanup after stopping VM failed - $err");
$self->{errors} = 1;
}

3
test/MigrationTest/Shared.pm
View File

@ -130,6 +130,9 @@ $qemu_server_module->mock(
clear_reboot_request => sub {
return 1;
},
vm_stop_cleanup => sub {
return;
},
get_efivars_size => sub {
return 128 * 1024;
},