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 D088060525 for ; Wed, 12 Aug 2020 12:02:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C74D0F4B7 for ; Wed, 12 Aug 2020 12:01:33 +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 E0E4BF4AE for ; Wed, 12 Aug 2020 12:01:32 +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 A4617445B1 for ; Wed, 12 Aug 2020 12:01:32 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 12 Aug 2020 12:01:27 +0200 Message-Id: <20200812100127.29722-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200812100127.29722-1-f.ebner@proxmox.com> References: <20200812100127.29722-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.004 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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: [pve-devel] [PATCH/RFC v2 qemu-server 3/3] restore_vma_archive: remove timeout for reading the device map 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: Wed, 12 Aug 2020 10:02:03 -0000 If there is no serious problem, it shouldn't be possible to run into this timeout anyways. It's just (extracting and) reading the header of the (compressed) vma file. And if there is a serious problem, then the commands will most likely fail for a different reason, e.g. unable to open, corrupt vma, etc. Signed-off-by: Fabian Ebner --- New in v2 Hope I'm not missing anything important. PVE/QemuServer.pm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 794819b..342114d 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6162,8 +6162,6 @@ sub restore_vma_archive { $add_pipe->(['vma', 'extract', '-v', '-r', $mapfifo, $readfrom, $tmpdir]); - my $timeout = 5; - my $devinfo = {}; my $rpcenv = PVE::RPCEnvironment::get(); @@ -6260,9 +6258,6 @@ sub restore_vma_archive { local $SIG{QUIT} = local $SIG{HUP} = local $SIG{PIPE} = sub { die "interrupted by signal\n"; }; - local $SIG{ALRM} = sub { die "got timeout reading device map\n"; }; - - alarm($timeout); my $parser = sub { my $line = shift; @@ -6273,7 +6268,6 @@ sub restore_vma_archive { my ($dev_id, $size, $devname) = ($1, $2, $3); $devinfo->{$devname} = { size => $size, dev_id => $dev_id }; } elsif ($line =~ m/^CTIME: /) { - alarm(0); &$print_devmap(); print $fifofh "done\n"; close($fifofh); @@ -6285,8 +6279,6 @@ sub restore_vma_archive { }; my $err = $@; - alarm(0); - $restore_deactivate_volumes->($cfg, $devinfo); unlink $mapfifo; -- 2.20.1