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 EB067B51C for ; Fri, 30 Jun 2023 13:49:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE1D623339 for ; Fri, 30 Jun 2023 13:49:27 +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 ; Fri, 30 Jun 2023 13:49:26 +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 6403A42A03 for ; Fri, 30 Jun 2023 13:49:26 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 30 Jun 2023 13:49:22 +0200 Message-Id: <20230630114923.65506-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230630114923.65506-1-f.ebner@proxmox.com> References: <20230630114923.65506-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.045 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pvecm.pm] Subject: [pve-devel] [PATCH v2 cluster 3/4] pvecm: updatecerts: silence warning that potentially has no 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: Fri, 30 Jun 2023 11:49:28 -0000 If timeout is reached, run_fork_with_timeout will warn "got timeout". When processing triggers for pve-manager (because of ExecStartPre of pveproxy.service invoking pvecm updatecerts) that warning can appear in the apt output without any context (output of the forked sub doesn't appear there). So make sure to silence it, if the silent param is set. Signed-off-by: Fiona Ebner --- New in v2. Can't use a normal if here, because of the 'local'. src/PVE/CLI/pvecm.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/PVE/CLI/pvecm.pm b/src/PVE/CLI/pvecm.pm index a0550c2..2cdc2cd 100755 --- a/src/PVE/CLI/pvecm.pm +++ b/src/PVE/CLI/pvecm.pm @@ -574,6 +574,17 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; + # If timeout is reached, run_fork_with_timeout will warn "got timeout". When processing + # triggers for pve-manager (because of ExecStartPre of pveproxy.service invoking this + # command here) that warning can appear in the apt output without any context (output of the + # forked sub doesn't appear there). So make sure to silence it, if the silent param is set. + my $filter_timeout_warning = sub { + my ($msg) = @_; + return if $msg =~ m/^got timeout/; + print STDERR $msg; + }; + local $SIG{__WARN__} = $filter_timeout_warning if $param->{silent}; + # we get called by the pveproxy.service ExecStartPre and as we do # IO (on /etc/pve) which can hang (uninterruptedly D state). That'd be # no-good for ExecStartPre as it fails the whole service in this case -- 2.39.2