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

vm_resume: fix nocheck/migrate handling

Browse Source 
it's not deterministic whether the rename/move of the VM config
triggered on the source side of a migration is already visible on the
target side when vm_resume is executed. check the vmlist for the node
where the config is currently located if $nocheck is set - it is now
needed to add the forwarding DB entries to the bridge.

this fixes an issue on busier or slower clusters, where pmxcfs hasn't
yet processed the rename, and resuming would fail with an error about
the config not existing.

Reported-by: Dominik Csapak <d.csapak@proxmox.com>

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-11-21 13:16:04 +01:00 committed by Thomas Lamprecht
parent c9a0924df8
commit 270bfff2e1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/QemuServer.pm
View File

@ -6366,7 +6366,17 @@ sub vm_resume {
my $res = mon_cmd($vmid, 'query-status');
my $resume_cmd = 'cont';
my $reset = 0;
my $conf = PVE::QemuConfig->load_config($vmid);
my $conf;
if ($nocheck) {
my $vmlist = PVE::Cluster::get_vmlist();
my $node;
if (exists($vmlist->{ids}->{$vmid})) {
$node = $vmlist->{ids}->{$vmid}->{node};
}
$conf = PVE::QemuConfig->load_config($vmid, $node);
} else {
$conf = PVE::QemuConfig->load_config($vmid);
}
if ($res->{status}) {
return if $res->{status} eq 'running'; # job done, go home
@ -6375,7 +6385,6 @@ sub vm_resume {
}
if (!$nocheck) {
PVE::QemuConfig->check_lock($conf)
if !($skiplock || PVE::QemuConfig->has_lock($conf, 'backup'));
}