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 E1AFA6315D for ; Thu, 24 Feb 2022 08:52:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CF9E9502D for ; Thu, 24 Feb 2022 08:52:18 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A84435019 for ; Thu, 24 Feb 2022 08:52:17 +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 7F67946E35 for ; Thu, 24 Feb 2022 08:52:17 +0100 (CET) Message-ID: <4789480b-f341-f34e-ef3e-17f3bcdf20ec@proxmox.com> Date: Thu, 24 Feb 2022 08:52:12 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Content-Language: en-US To: pve-devel@lists.proxmox.com, m.heiserer@proxmox.com References: <20220223111558.369945-1-m.heiserer@proxmox.com> From: Fabian Ebner In-Reply-To: <20220223111558.369945-1-m.heiserer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.130 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - 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: Re: [pve-devel] [PATCH qemu-server v2] fix 3886: QEMU restore: verify storage allows images before writing 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: Thu, 24 Feb 2022 07:52:48 -0000 Am 23.02.22 um 12:15 schrieb Matthias Heiserer: > When restoring a backup and the storage the disks would be created on > doesn't allow 'images', the process errors without cleanup. > This is the same behaviour we currently have when the storage is > disabled. > > Signed-off-by: Matthias Heiserer > --- > PVE/QemuServer.pm | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index a99f1a5..aaada7a 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -6243,6 +6243,9 @@ my $parse_backup_hints = sub { > } elsif (!$storeid) { > $storeid = 'local'; > } > + my $scfg = PVE::Storage::storage_config($storecfg, $storeid); > + die "Content type 'images' is not available on storage '$storeid'\n" > + if !$scfg->{content}->{images}; Style nit: could be placed closer to the permission check for Datastore.AllocateSpace that follows below. > $format = 'raw' if !$format; > $devinfo->{$devname}->{devname} = $devname; > $devinfo->{$devname}->{virtdev} = $virtdev; > @@ -6264,6 +6267,8 @@ my $parse_backup_hints = sub { > $storeid = $options->{storage} if defined ($options->{storage}); > my $scfg = PVE::Storage::storage_config($storecfg, $storeid); > my $format = qemu_img_format($scfg, $volname); # has 'raw' fallback > + die "Content type 'images' is not available on storage '$storeid'\n" > + if !$scfg->{content}->{images}; Here, the permission check for Datastore.AllocateSpace is missing, which is the other existing bug. Maybe it's even worth having a small closure doing both checks to re-use in both cases, but not really sure. > > $virtdev_hash->{$virtdev} = { > format => $format,