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 846C062133 for ; Thu, 20 Aug 2020 10:56:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 81F0D2B9DD for ; Thu, 20 Aug 2020 10:56:26 +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 96A352B9CF for ; Thu, 20 Aug 2020 10:56:25 +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 53C754333B for ; Thu, 20 Aug 2020 10:56:25 +0200 (CEST) To: Proxmox VE development discussion , Fabian Ebner References: <20200812100127.29722-1-f.ebner@proxmox.com> From: Thomas Lamprecht Message-ID: <5b9a10fb-de40-0021-b9eb-346c74bb730e@proxmox.com> Date: Thu, 20 Aug 2020 10:56:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:80.0) Gecko/20100101 Thunderbird/80.0 MIME-Version: 1.0 In-Reply-To: <20200812100127.29722-1-f.ebner@proxmox.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.607 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 -1.361 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 1/3] Fix #2816: remove timeout for allocation on restore 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, 20 Aug 2020 08:56:56 -0000 On 12.08.20 12:01, Fabian Ebner wrote: > qcow2 images are allocated with --preallocation=metadata, > which can take a while for large images. > > A 5 second timeout is set before reading the device map, so it's s/seconds/minutes/ ? > necessary to restore the old timeout before calling print_devmap(). > Time spent allocating now falls under that old timeout. > > Signed-off-by: Fabian Ebner > --- > > Changes from v1: > * instead of increasing the allocation timeout, > get rid of it as Fabian suggested > > PVE/QemuServer.pm | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index a9c0dac..7169006 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -6274,15 +6274,13 @@ sub restore_vma_archive { > my ($dev_id, $size, $devname) = ($1, $2, $3); > $devinfo->{$devname} = { size => $size, dev_id => $dev_id }; > } elsif ($line =~ m/^CTIME: /) { > - # we correctly received the vma config, so we can disable > - # the timeout now for disk allocation (set to 10 minutes, so > - # that we always timeout if something goes wrong) > - alarm(600); > - &$print_devmap(); > - print $fifofh "done\n"; > + # we correctly received the vma config, so restore old timeout > my $tmp = $oldtimeout || 0; > $oldtimeout = undef; > alarm($tmp); > + > + &$print_devmap(); > + print $fifofh "done\n"; > close($fifofh); > } > }; >