From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei_store_err: use level-trigger for error pipe
Date: Mon, 15 Aug 2022 19:28:33 +0000 [thread overview]
Message-ID: <20220815192833.21659-1-e@80x24.org> (raw)
This fixes deadlocks from errors inside lei/store when multiple
errors are spewed.
---
lib/PublicInbox/LeiStoreErr.pm | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/LeiStoreErr.pm b/lib/PublicInbox/LeiStoreErr.pm
index cc085fdc..47fa2277 100644
--- a/lib/PublicInbox/LeiStoreErr.pm
+++ b/lib/PublicInbox/LeiStoreErr.pm
@@ -1,13 +1,12 @@
-# Copyright (C) 2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# forwards stderr from lei/store process to any lei clients using
# the same store, falls back to syslog if no matching clients exist.
package PublicInbox::LeiStoreErr;
-use strict;
-use v5.10.1;
+use v5.12;
use parent qw(PublicInbox::DS);
-use PublicInbox::Syscall qw(EPOLLIN EPOLLONESHOT);
+use PublicInbox::Syscall qw(EPOLLIN);
use Sys::Syslog qw(openlog syslog closelog);
use IO::Handle (); # ->blocking
@@ -15,24 +14,24 @@ sub new {
my ($cls, $rd, $lei) = @_;
my $self = bless { sock => $rd, store_path => $lei->store_path }, $cls;
$rd->blocking(0);
- $self->SUPER::new($rd, EPOLLIN | EPOLLONESHOT);
+ $self->SUPER::new($rd, EPOLLIN); # level-trigger
}
sub event_step {
my ($self) = @_;
- my $rbuf = $self->{rbuf} // \(my $x = '');
- $self->do_read($rbuf, 8192, length($$rbuf)) or return;
- my $cb;
+ my $n = sysread($self->{sock}, my $buf, 8192);
+ return ($!{EAGAIN} ? 0 : $self->close) if !defined($n);
+ return $self->close if !$n;
my $printed;
for my $lei (values %PublicInbox::DS::DescriptorMap) {
- $cb = $lei->can('store_path') // next;
+ my $cb = $lei->can('store_path') // next;
next if $cb->($lei) ne $self->{store_path};
my $err = $lei->{2} // next;
- print $err $$rbuf and $printed = 1;
+ print $err $buf and $printed = 1;
}
if (!$printed) {
openlog('lei/store', 'pid,nowait,nofatal,ndelay', 'user');
- for my $l (split(/\n/, $$rbuf)) { syslog('warning', '%s', $l) }
+ for my $l (split(/\n/, $buf)) { syslog('warning', '%s', $l) }
closelog(); # don't share across fork
}
}
reply other threads:[~2022-08-15 19:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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: https://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=20220815192833.21659-1-e@80x24.org \
--to=e@80x24.org \
--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).