about summary refs log tree commit homepage
path: root/lib/PublicInbox/Qspawn.pm
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-01-09 11:14:52 +0000
committerEric Wong <e@80x24.org>2020-01-09 11:23:34 +0000
commit79585642a30f54622541496a9a0090f0aa591692 (patch)
treee2dd98f9a802d7d5ecd7d1748122de6ddf5f26d3 /lib/PublicInbox/Qspawn.pm
parentdfd30c7aa686968b8a0dbd65c40b90d92816f87c (diff)
downloadpublic-inbox-79585642a30f54622541496a9a0090f0aa591692.tar.gz
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
Diffstat (limited to 'lib/PublicInbox/Qspawn.pm')
-rw-r--r--lib/PublicInbox/Qspawn.pm29
1 files 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");
                 }