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 AFDE9908BB for ; Mon, 12 Feb 2024 13:06:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8F55C1863F for ; Mon, 12 Feb 2024 13:06:38 +0100 (CET) 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 ; Mon, 12 Feb 2024 13:06:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 56B0547999 for ; Mon, 12 Feb 2024 13:06:37 +0100 (CET) Date: Mon, 12 Feb 2024 13:06:36 +0100 From: Christoph Heiss To: Thomas Lamprecht Cc: Proxmox VE development discussion Message-ID: References: <20240209105629.285910-1-c.heiss@proxmox.com> <20240209105629.285910-3-c.heiss@proxmox.com> <166b8d2e-c35e-4358-bf3c-404e21c34921@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <166b8d2e-c35e-4358-bf3c-404e21c34921@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.147 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes 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 - Subject: Re: [pve-devel] [PATCH installer 2/4] sys: command: allow terminating the process early from log subroutine 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: Mon, 12 Feb 2024 12:06:38 -0000 Thanks for the review! On Mon, Feb 12, 2024 at 11:58:27AM +0100, Thomas Lamprecht wrote: > Am 09/02/2024 um 11:55 schrieb Christoph Heiss: > > This is done in a entirely backwards-compatible way, i.e. existing > > usages don't need any modification. > > can you actually describe here that you do so by checking the return > value of the stdout parser closure, can be done in a short sentence > and surely doesn't hurt. I'll add some more documentation for this in v2. > > > > > Signed-off-by: Christoph Heiss > > --- > > Proxmox/Sys/Command.pm | 9 ++++++++- > > 1 file changed, 8 insertions(+), 1 deletion(-) > > > > diff --git a/Proxmox/Sys/Command.pm b/Proxmox/Sys/Command.pm > > index c3e24b3..bf67b27 100644 > > --- a/Proxmox/Sys/Command.pm > > +++ b/Proxmox/Sys/Command.pm > > @@ -114,7 +114,14 @@ sub run_command { > > $logout .= $buf; > > while ($logout =~ s/^([^\010\r\n]*)(\r|\n|(\010)+|\r\n)//s) { > > my $line = $1; > > - $func->($line) if $func; > > + if ($func) { > > + my $ret = $func->($line); > > + if (defined($ret) && $ret == 1) { > > maybe we can define a constant for this, so that we have > descriptive name that better conveys the meaning of this special > return value, e.g., something like: Sounds good, I will add that. > > use constant RET_TIMED_OUT => 1; > > (no hard feelings on that name, just used the first thing that came to > my mind) > > > > + kill('KILL', $pid); > > + waitpid($pid, 0); > > FWIW, this can block forever too though? It /could/ probably happen if the process e.g. somehow enters D-state after reading the previous line of output, good catch. > > How about factoring out the kill+waiting in it's own sub (could be > also one for waitpid with timeout and combined kill+waitpid that reuses > the first one), that does a TERM first, checks with WNOHANG if the > target PID exited and if not, sends the KILL and loops until a timeout > (say, /throws dice/, 5s) expired. > > That way no D-state, or whatever else can block the process' death, > is hanging up the installer. That seems like the /really/ bulletproof way. This was more a proof-of-concept-fix anyway in the beginning, so a bit of refactoring on that thing is warranted after all, I guess. > > > + return $ostream; > > + } > > + }; > > } > > > > } elsif ($h eq $error) { >