From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BEBC8C5FD for ; Tue, 29 Nov 2022 13:10:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 975187B8C for ; Tue, 29 Nov 2022 13:09:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 29 Nov 2022 13:09:31 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8FAA343CBE for ; Tue, 29 Nov 2022 13:09:31 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 29 Nov 2022 13:09:26 +0100 Message-Id: <20221129120926.1241594-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.135 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server] fix #4372: fix vm_resume migration callback X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2022 12:10:02 -0000 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 --- 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