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 6E5D5604BD for ; Wed, 12 Aug 2020 12:01:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6CF94F4BD for ; Wed, 12 Aug 2020 12:01:34 +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 CD34AF4A6 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 9376743153 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:26 +0200 Message-Id: <20200812100127.29722-2-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 2/3] restore_vma_archive: get rid of oldtimeout handling 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:01:34 -0000 Assume that the function is called within a worker not restricted by any timeout. This is true currently, because the only path leading to restore_vma_archive is via restore_file_archive being called within a worker by the create_vm API call. Avoid generic timeout error message. Signed-off-by: Fabian Ebner --- New in v2 PVE/QemuServer.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 7169006..794819b 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6162,7 +6162,6 @@ sub restore_vma_archive { $add_pipe->(['vma', 'extract', '-v', '-r', $mapfifo, $readfrom, $tmpdir]); - my $oldtimeout; my $timeout = 5; my $devinfo = {}; @@ -6261,9 +6260,9 @@ 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\n"; }; + local $SIG{ALRM} = sub { die "got timeout reading device map\n"; }; - $oldtimeout = alarm($timeout); + alarm($timeout); my $parser = sub { my $line = shift; @@ -6274,11 +6273,7 @@ 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 restore old timeout - my $tmp = $oldtimeout || 0; - $oldtimeout = undef; - alarm($tmp); - + alarm(0); &$print_devmap(); print $fifofh "done\n"; close($fifofh); @@ -6290,7 +6285,7 @@ sub restore_vma_archive { }; my $err = $@; - alarm($oldtimeout) if $oldtimeout; + alarm(0); $restore_deactivate_volumes->($cfg, $devinfo); -- 2.20.1