From 3ac73bd16d9fa7beba6a1735dd5c505d021e227a Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 2 Jan 2020 09:24:59 +0000 Subject: qspawn: use per-call quiet flag for solver 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 c9812b32..a78360fd 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -499,7 +499,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; -- cgit v1.2.3-24-ge0c7