From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 3/3] qspawn: catch transient errors on pipe, EPOLL_CTL_ADD
Date: Thu, 9 Jan 2020 11:14:52 +0000 [thread overview]
Message-ID: <20200109111452.14556-4-e@yhbt.net> (raw)
In-Reply-To: <20200109111452.14556-1-e@yhbt.net>
popen_rd dies on pipe()/pipe2() failure due to FD exhaustion.
EPOLL_CTL_ADD (via PublicInbox::HTTPD::Async->new) may also fail
due to memory exhaustion or exceeding the value of
/proc/sys/fs/epoll/max_user_watches
---
lib/PublicInbox/Qspawn.pm | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 65bb178a..31a1583d 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -45,25 +45,28 @@ sub new ($$$;) {
sub _do_spawn {
my ($self, $start_cb, $limiter) = @_;
my $err;
- my ($cmd, $cmd_env, $opts) = @{$self->{args}};
- my %opts = %{$opts || {}};
+ my ($cmd, $cmd_env, $opt) = @{$self->{args}};
+ my %o = %{$opt || {}};
$self->{limiter} = $limiter;
foreach my $k (PublicInbox::Spawn::RLIMITS()) {
if (defined(my $rlimit = $limiter->{$k})) {
- $opts{$k} = $rlimit;
+ $o{$k} = $rlimit;
}
}
+ eval {
+ # popen_rd may die on EMFILE, ENFILE
+ ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $cmd_env, \%o);
+ $self->{args} = $o{quiet} ? undef : $cmd;
- ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $cmd_env, \%opts);
+ die "E: $!" unless defined($self->{pid});
- $self->{args} = $opts{quiet} ? undef : $cmd;
-
- if (defined $self->{pid}) {
$limiter->{running}++;
- } else {
- $self->{err} = $!;
+ $start_cb->($self); # EPOLL_CTL_ADD may ENOSPC/ENOMEM
+ };
+ if ($@) {
+ $self->{err} = $@;
+ finish($self);
}
- $start_cb->($self);
}
sub child_err ($) {
@@ -105,7 +108,11 @@ sub waitpid_err ($$) {
}
if ($err) {
- $self->{err} = $err;
+ if ($self->{err}) {
+ $self->{err} .= "; $err";
+ } else {
+ $self->{err} = $err;
+ }
if ($env && $self->{args}) {
log_err($env, join(' ', @{$self->{args}}) . ": $err");
}
prev parent reply other threads:[~2020-01-09 11:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 11:14 [PATCH 0/3] improve error handling for rare cases Eric Wong
2020-01-09 11:14 ` [PATCH 1/3] listener: EPOLL_CTL_ADD errors are non fatal Eric Wong
2020-01-09 11:14 ` [PATCH 2/3] http: log response_write errors Eric Wong
2020-01-09 11:14 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200109111452.14556-4-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).