[pve-devel] [PATCH qemu-server] fix #4372: fix vm_resume migration callback

[Fabian Grünbichler]

the fix for the recently introduced requirement of loading the VM config while
migrating was incomplete, since the vmlist node value could already be out of
date by the time load_config is called.

extend the fallback behaviour even further, by doing the following sequence:
- try regular load_config (likely case, rename already fully processed)
- if it fails, get node from vmlist, and load_config using that
- it that fails, invalidate the PVE::Cluster cache, retry regular load_config

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---

Notes:
    an alternative approach would be to do the fallback load first, and if that
    fails do the target node load. it has the downside of doing two loads in the
    "good"/likely case where the rename is processed before the resume call, while
    making the unlikely case (fallback needed) cheaper.

 PVE/QemuServer.pm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index a746b3dd..a52a883e 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6377,12 +6377,18 @@ sub vm_resume {
 	my $reset = 0;
 	my $conf;
 	if ($nocheck) {
-	    my $vmlist = PVE::Cluster::get_vmlist();
-	    my $node;
-	    if (exists($vmlist->{ids}->{$vmid})) {
-		$node = $vmlist->{ids}->{$vmid}->{node};
+	    $conf = eval { PVE::QemuConfig->load_config($vmid) }; # try on target node
+	    if ($@) {
+		my $vmlist = PVE::Cluster::get_vmlist();
+		if (exists($vmlist->{ids}->{$vmid})) {
+		    my $node = $vmlist->{ids}->{$vmid}->{node};
+		    $conf = eval { PVE::QemuConfig->load_config($vmid, $node) }; # try on source node
+		}
+		if (!$conf) {
+		    PVE::Cluster::cfs_update(); # vmlist was wrong, invalidate cache
+		    $conf = PVE::QemuConfig->load_config($vmid); # last try on target node again
+		}
 	    }
-	    $conf = PVE::QemuConfig->load_config($vmid, $node);
 	} else {
 	    $conf = PVE::QemuConfig->load_config($vmid);
 	}
-- 
2.30.2