From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 490FA1F47A for ; Thu, 2 Jan 2020 09:25:00 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/3] qspawn: use per-call quiet flag for solver Date: Thu, 2 Jan 2020 09:24:59 +0000 Message-Id: <20200102092459.17612-4-e@80x24.org> In-Reply-To: <20200102092459.17612-1-e@80x24.org> References: <20200102092459.17612-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: solver can spawn multiple processes per HTTP request, but "git apply" failures are needlessly noisy due to corrupt patches. We also don't want to silence "git ls-files" or "git update-index" errors using $env->{'qspawn.quiet'}, either, so this granularity is needed. Admins can check for 500 errors in access logs to detect (and reproduce) solver failures, anyways, so there's no need to log every time "git apply" rejects a corrupt patch. --- lib/PublicInbox/Qspawn.pm | 6 ++---- lib/PublicInbox/SolverGit.pm | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index 1a2b70e7..65bb178a 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -56,9 +56,7 @@ sub _do_spawn { ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $cmd_env, \%opts); - # drop any IO handles opt was holding open via $opt->{hold} - # No need to hold onto the descriptor once the child process has it. - $self->{args} = $cmd; # keep this around for logging + $self->{args} = $opts{quiet} ? undef : $cmd; if (defined $self->{pid}) { $limiter->{running}++; @@ -108,7 +106,7 @@ sub waitpid_err ($$) { if ($err) { $self->{err} = $err; - if ($env && !$env->{'qspawn.quiet'}) { + if ($env && $self->{args}) { log_err($env, join(' ', @{$self->{args}}) . ": $err"); } } diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index e1b82f3e..ef76d706 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -497,7 +497,7 @@ sub do_git_apply ($) { } while (@$patches && $len < $ARG_SIZE_MAX && !oids_same_ish($patches->[0]->{oid_b}, $prv_oid_b)); - my $opt = { 2 => 1, -C => $dn }; + my $opt = { 2 => 1, -C => $dn, quiet => 1 }; my $qsp = PublicInbox::Qspawn->new(\@cmd, $self->{git_env}, $opt); $self->{-cur_di} = $di; $self->{-qsp} = $qsp;