From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <l.stechauner@proxmox.com>
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 F00337192E
for <pve-devel@lists.proxmox.com>; Tue, 29 Jun 2021 15:53:33 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id ED514F816
for <pve-devel@lists.proxmox.com>; Tue, 29 Jun 2021 15:53:33 +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 0A636F80D
for <pve-devel@lists.proxmox.com>; Tue, 29 Jun 2021 15:53:33 +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 CCC95467E7
for <pve-devel@lists.proxmox.com>; Tue, 29 Jun 2021 15:53:32 +0200 (CEST)
From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 29 Jun 2021 15:53:16 +0200
Message-Id: <20210629135316.2095374-1-l.stechauner@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.650 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
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. [create.pm]
Subject: [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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 29 Jun 2021 13:53:34 -0000
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 <l.stechauner@proxmox.com>
---
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";
--
2.30.2