* [PATCH 3/3] qspawn: use per-call quiet flag for solver
2020-01-02 9:24 6% [PATCH 0/3] solver bugfixes and tweaks Eric Wong
@ 2020-01-02 9:24 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-02 9:24 UTC (permalink / raw)
To: meta
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;
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] solver bugfixes and tweaks
@ 2020-01-02 9:24 6% Eric Wong
2020-01-02 9:24 7% ` [PATCH 3/3] qspawn: use per-call quiet flag for solver Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-02 9:24 UTC (permalink / raw)
To: meta
A couple of improvements from errors I've seen with solver
and hopefully no regressions. [PATCH 2/3] is a bit scary :x
Eric Wong (3):
solver: try the next patch on apply failures
solver: extract_diff: deal with missing "diff --git" line
qspawn: use per-call quiet flag for solver
lib/PublicInbox/Qspawn.pm | 6 +-
lib/PublicInbox/SolverGit.pm | 168 ++++++++++++++++++-----------------
2 files changed, 89 insertions(+), 85 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-02 9:24 6% [PATCH 0/3] solver bugfixes and tweaks Eric Wong
2020-01-02 9:24 7% ` [PATCH 3/3] qspawn: use per-call quiet flag for solver Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).