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 3CD2B642AA for ; Tue, 6 Oct 2020 10:57:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2473023B16 for ; Tue, 6 Oct 2020 10:56:58 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8704023B09 for ; Tue, 6 Oct 2020 10:56:57 +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 44DFF45529 for ; Tue, 6 Oct 2020 10:56:57 +0200 (CEST) To: Thomas Lamprecht , Proxmox VE development discussion References: <20200928083631.30407-1-m.limbeck@proxmox.com> <20200928083631.30407-2-m.limbeck@proxmox.com> <8ff18626-3a98-8fdd-c551-da990a77faf2@proxmox.com> From: Mira Limbeck Message-ID: <4eedd179-1ac9-3150-8f35-9c18fd7ef656@proxmox.com> Date: Tue, 6 Oct 2020 10:56:56 +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: <8ff18626-3a98-8fdd-c551-da990a77faf2@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.476 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.001 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 v2 qemu-server 2/2] fix clone_disk 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: Tue, 06 Oct 2020 08:57:29 -0000 On 10/5/20 5:35 PM, Thomas Lamprecht wrote: > On 28.09.20 10:36, 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 >> --- >> v2: changed subject >> >> 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; > doesn't this logs a "use of undefined value in division" or something like that > somewhere in the non-else case? No, in the cloudinit case we set it to a constant. In the efidisk case we call get_efivars_size() which dies if efivars is not a file, otherwise we get a size (-s). And in the else case we also die if we can't get the size. So size is set in every case before the first use. > >> $newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $newvmid, $dst_format, $name, $size); >>