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 78744687A0 for ; Thu, 22 Jul 2021 09:07:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6EF8FE113 for ; Thu, 22 Jul 2021 09:06:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 EFCEDE105 for ; Thu, 22 Jul 2021 09:06: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 C65AE425AD for ; Thu, 22 Jul 2021 09:06:57 +0200 (CEST) To: Lorenz Stechauner , Proxmox VE development discussion References: <20210629135316.2095374-1-l.stechauner@proxmox.com> From: Lorenz Stechauner Message-ID: <39cc40f3-374c-9370-3371-d7993b1324eb@proxmox.com> Date: Thu, 22 Jul 2021 09:06:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210629135316.2095374-1-l.stechauner@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.616 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.117 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH container] fix #3478: abort container creation on arch detection timeout 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, 22 Jul 2021 07:07:28 -0000 ping On 29.06.21 15:53, Lorenz Stechauner wrote: > increased the timeout for detect_arch from 5 to 10 seconds. > > until now, on any error detect_architecture would fall back to amd64. > to avoid falling back due to an timeout error this function now dies > on timeout errors. > > additionally minor changes to the error messages have been made. > > Signed-off-by: Lorenz Stechauner > --- > src/PVE/LXC/Create.pm | 27 ++++++++++++++++++++++++--- > 1 file changed, 24 insertions(+), 3 deletions(-) > > diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm > index 82d7ad9..0260578 100644 > --- a/src/PVE/LXC/Create.pm > +++ b/src/PVE/LXC/Create.pm > @@ -52,10 +52,31 @@ sub detect_architecture { > return $arch; > }; > > - my $arch = eval { PVE::Tools::run_fork_with_timeout(5, $detect_arch) }; > - if (my $err = $@) { > + my $arch; > + my $status = 'error'; > + eval { > + $arch = PVE::Tools::run_fork_with_timeout(10, $detect_arch); > + if (!defined($arch)) { > + if ($@) { > + $status = 'timeout'; > + die $@; > + } else { > + $status = 'error'; > + die "unknown error\n"; > + } > + } > + $status = 'success'; > + }; > + > + my $err = $@; > + if ($status eq 'timeout') { > + # on timeout > + die "Architecture detection failed: $err"; # $err ends with \n > + } elsif ($status eq 'error') { > + # any other error > $arch = 'amd64'; > - print "Architecture detection failed: $err\nFalling back to amd64.\n" . > + print "Architecture detection failed: $err" . # $err ends with \n > + "Falling back to $arch.\n" . > "Use `pct set VMID --arch ARCH` to change.\n"; > } else { > print "Detected container architecture: $arch\n";