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 1F68A9162B for ; Mon, 27 Mar 2023 11:01:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 01DBB2E7EE for ; Mon, 27 Mar 2023 11:01:12 +0200 (CEST) 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 ; Mon, 27 Mar 2023 11:01:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 183ED46F08 for ; Mon, 27 Mar 2023 11:01:11 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 27 Mar 2023 11:01:05 +0200 Message-Id: <20230327090106.15803-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Subject: [pve-devel] [PATCH qemu-server 1/2] backup: prepare: fix format detection for disks without storage ID 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: Mon, 27 Mar 2023 09:01:12 -0000 which is the case for passed-through disks. The qemu_img_format() function cannot correctly handle those, and it's not safe to assume they are raw (it's most likely, but not guaranteed), so just use the storage method for the format like it was done before commit efa3aa24 ("avoid list context for volume_size_info calls"). This will use 'qemu-img info' to get the actual format. Reported in the community forum: https://forum.proxmox.com/threads/124794/ https://forum.proxmox.com/threads/124823/ https://forum.proxmox.com/threads/124818/ Fixes: efa3aa24 ("avoid list context for volume_size_info calls") Signed-off-by: Fiona Ebner --- PVE/VZDump/QemuServer.pm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index add26ad6..036a7228 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -119,11 +119,20 @@ sub prepare { } next if !$path; - my $size = eval { PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5) }; - die "no such volume '$volid'\n" if $@; + my ($size, $format); + if ($storeid) { + # The call in list context can be expensive for certain plugins like RBD, just get size + $size = eval { PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5) }; + die "no such volume '$volid'\n" if $@; - my $scfg = PVE::Storage::storage_config($self->{storecfg}, $storeid); - my $format = PVE::QemuServer::qemu_img_format($scfg, $volname); + my $scfg = PVE::Storage::storage_config($self->{storecfg}, $storeid); + $format = PVE::QemuServer::qemu_img_format($scfg, $volname); + } else { + ($size, $format) = eval { + PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5); + }; + die "no such volume '$volid'\n" if $@; + } my $diskinfo = { path => $path, -- 2.30.2