ipc: more helpful ETOOMANYREFS error messages

[public-inbox.git] / lib / PublicInbox / IPC.pm

diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index d2ff038dc77463fa363af385dc5eccef1183a27b..37f029446ad75d13ee58257e84f76f9968874c1c 100644 (file)
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -14,8 +14,8 @@ use Carp qw(confess croak);
 use PublicInbox::DS qw(dwaitpid);
 use PublicInbox::Spawn;
 use PublicInbox::OnDestroy;
+use PublicInbox::WQWorker;
 use Socket qw(AF_UNIX MSG_EOR SOCK_STREAM);
-use Errno qw(EMSGSIZE);
 my $SEQPACKET = eval { Socket::SOCK_SEQPACKET() }; # portable enough?
 use constant PIPE_BUF => $^O eq 'linux' ? 4096 : POSIX::_POSIX_PIPE_BUF();
 my $WQ_MAX_WORKERS = 4096;
@@ -138,8 +138,10 @@ sub ipc_worker_spawn {
 
 sub ipc_worker_reap { # dwaitpid callback
        my ($self, $pid) = @_;
-       # SIGTERM (15) is our default exit signal
-       warn "PID:$pid died with \$?=$?\n" if $? && ($? & 127) != 15;
+       return if !$?;
+       # TERM(15) is our default exit signal, PIPE(13) is likely w/ pager
+       my $s = $? & 127;
+       warn "PID:$pid died with \$?=$?\n" if $s != 15 && $s != 13;
 }
 
 sub wq_wait_old {
@@ -151,6 +153,8 @@ sub wq_wait_old {
 # for base class, override in sub classes
 sub ipc_atfork_prepare {}
 
+sub wq_atexit_child {}
+
 sub ipc_atfork_child {
        my ($self) = @_;
        my $io = delete($self->{-ipc_atfork_child_close}) or return;
@@ -251,10 +255,11 @@ sub ipc_sibling_atfork_child {
        $pid == $$ and die "BUG: $$ ipc_atfork_child called on itself";
 }
 
-sub _recv_and_run {
+sub recv_and_run {
        my ($self, $s2, $len, $full_stream) = @_;
        my @fds = $recv_cmd->($s2, my $buf, $len);
-       my $n = length($buf // '') or return;
+       return if scalar(@fds) && !defined($fds[0]);
+       my $n = length($buf) or return 0;
        my $nfd = 0;
        for my $fd (@fds) {
                if (open(my $cmdfh, '+<&=', $fd)) {
@@ -274,21 +279,22 @@ sub _recv_and_run {
        undef $buf;
        my $sub = shift @$args;
        eval { $self->$sub(@$args) };
-       warn "$$ wq_worker: $@" if $@ && ref($@) ne 'PublicInbox::SIGPIPE';
+       warn "$$ wq_worker: $@" if $@;
        delete @$self{0..($nfd-1)};
        $n;
 }
 
 sub wq_worker_loop ($) {
        my ($self) = @_;
-       my $len = $self->{wq_req_len} // (4096 * 33);
-       my $s2 = $self->{-wq_s2} // die 'BUG: no -wq_s2';
-       1 while (_recv_and_run($self, $s2, $len));
+       my $wqw = PublicInbox::WQWorker->new($self);
+       PublicInbox::DS->SetPostLoopCallback(sub { $wqw->{sock} });
+       PublicInbox::DS->EventLoop;
+       PublicInbox::DS->Reset;
 }
 
 sub do_sock_stream { # via wq_do, for big requests
        my ($self, $len) = @_;
-       _recv_and_run($self, delete $self->{0}, $len, 1);
+       recv_and_run($self, delete $self->{0}, $len, 1);
 }
 
 sub wq_do { # always async
@@ -296,8 +302,9 @@ sub wq_do { # always async
        if (my $s1 = $self->{-wq_s1}) { # run in worker
                my $fds = [ map { fileno($_) } @$ios ];
                my $n = $send_cmd->($s1, $fds, freeze([$sub, @args]), MSG_EOR);
-               return if defined($n);
-               croak "sendmsg error: $!" if $! != EMSGSIZE;
+               return if defined($n); # likely
+               croak "sendmsg: $! (check RLIMIT_NOFILE)" if $!{ETOOMANYREFS};
+               croak "sendmsg: $!" if !$!{EMSGSIZE};
                socketpair(my $r, my $w, AF_UNIX, SOCK_STREAM, 0) or
                        croak "socketpair: $!";
                my $buf = freeze([$sub, @args]);
@@ -315,7 +322,7 @@ sub wq_do { # always async
        } else {
                @$self{0..$#$ios} = @$ios;
                eval { $self->$sub(@args) };
-               warn "wq_do: $@" if $@ && ref($@) ne 'PublicInbox::SIGPIPE';
+               warn "wq_do: $@" if $@;
                delete @$self{0..$#$ios}; # don't close
        }
 }