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 9DBCE60DB4 for ; Fri, 25 Sep 2020 11:40:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 93B6F1A3BA for ; Fri, 25 Sep 2020 11:40:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 1377B1A3AD for ; Fri, 25 Sep 2020 11:40:08 +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 CB46845576 for ; Fri, 25 Sep 2020 11:40:02 +0200 (CEST) To: pve-devel@lists.proxmox.com References: <20200925085104.17299-1-m.limbeck@proxmox.com> <20200925085104.17299-2-m.limbeck@proxmox.com> From: Mira Limbeck Message-ID: <47b476a1-51dd-8f50-655b-1d66ff202840@proxmox.com> Date: Fri, 25 Sep 2020 11:40:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200925085104.17299-2-m.limbeck@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 0.590 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.214 Looks like a legit reply (A) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: Re: [pve-devel] [PATCH qemu-server 2/2] fix volume_size_info failing for nonexistent cloudinit disk 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: Fri, 25 Sep 2020 09:40:08 -0000 The subject should probably be 'fix clone_disk failing for nonexistent cloudinit disk'. Want me to send a v2? On 9/25/20 10:51 AM, Mira Limbeck wrote: > After migration or a rollback the cloudinit disk might not be allocated, so > volume_size_info() fails. As we override the value anyway for cloudinit > and efi disks simply move the volume_size_info() call into the 'else' > branch. > > Signed-off-by: Mira Limbeck > --- > PVE/QemuServer.pm | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index 2747c66..49765b7 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -6895,10 +6895,10 @@ sub clone_disk { > $storeid = $storage if $storage; > > my $dst_format = resolve_dst_disk_format($storecfg, $storeid, $volname, $format); > - my ($size) = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 3); > > print "create full clone of drive $drivename ($drive->{file})\n"; > my $name = undef; > + my $size = undef; > if (drive_is_cloudinit($drive)) { > $name = "vm-$newvmid-cloudinit"; > $name .= ".$dst_format" if $dst_format ne 'raw'; > @@ -6906,6 +6906,8 @@ sub clone_disk { > $size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE; > } elsif ($drivename eq 'efidisk0') { > $size = get_efivars_size($conf); > + } else { > + ($size) = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 3); > } > $size /= 1024; > $newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $newvmid, $dst_format, $name, $size);