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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 074628381 for ; Wed, 30 Aug 2023 15:07:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E44AF3521C for ; Wed, 30 Aug 2023 15:07:56 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 30 Aug 2023 15:07:56 +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 0FDB247787 for ; Wed, 30 Aug 2023 15:07:56 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 30 Aug 2023 15:07:52 +0200 Message-Id: <20230830130752.85746-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230830130752.85746-1-f.ebner@proxmox.com> References: <20230830130752.85746-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.076 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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. [tools.pm] Subject: [pve-devel] [PATCH common 2/2] run fork with timeout: only special case timeout error in list context 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, 30 Aug 2023 13:07:57 -0000 run_with_timeout() will treat a timeout error differently when called in list context and run_fork_with_timeout() should do the same. Ensure this by calling run_with_timeout() in list context if and only if run_fork_with_timeout() is called in list context too. Fixes: a6aa0ae ("run with timeout: return if timeout happened in list context") Signed-off-by: Fiona Ebner --- src/PVE/Tools.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index 724fb69..2cfe93f 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -1017,10 +1017,16 @@ sub run_fork_with_timeout { $res = $child_res->{result}; $error = $child_res->{error}; }; + my $got_timeout = 0; + my $wantarray = wantarray; # so it can be queried inside eval eval { if (defined($timeout)) { - (undef, $got_timeout) = run_with_timeout($timeout, $readvalues); + if ($wantarray) { + (undef, $got_timeout) = run_with_timeout($timeout, $readvalues); + } else { + run_with_timeout($timeout, $readvalues); + } } else { $readvalues->(); } -- 2.39.2