From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/5] lei_to_mail: avoid SEGV on worker exit via SIGTERM
Date: Sat, 30 Oct 2021 08:11:43 +0000 [thread overview]
Message-ID: <20211030081144.1080-5-e@80x24.org> (raw)
In-Reply-To: <20211030081144.1080-1-e@80x24.org>
->DESTROY ordering via "exit()" calls is tricky, and dedupe
checks were causing problems.
AFAIK, this only affects users who manually enable WAL on
lei/store/ei*/over.sqlite3. Fortunately, there is no data
corruption as a result even though "read-only" WAL requires
write permissions.
---
lib/PublicInbox/LeiToMail.pm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 90db30e53089..3c5e7e59e8ee 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -756,6 +756,12 @@ sub ipc_atfork_child {
$lei->_lei_atfork_child;
$lei->{auth}->do_auth_atfork($self) if $lei->{auth};
$SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
+ $self->{git} = $self->{lei}->{ale}->git;
+ $SIG{TERM} = sub { # avoid ->DESTROY ordering problems
+ my $git = delete $self->{git};
+ $git->async_wait_all if $git;
+ exit(15 + 128);
+ };
$self->SUPER::ipc_atfork_child;
}
@@ -776,7 +782,7 @@ sub write_mail { # via ->wq_io_do
my ($self, $smsg, $eml) = @_;
return $self->{wcb}->(undef, $smsg, $eml) if $eml;
$smsg->{-lms_rw} = $self->{-lms_rw};
- $self->{lei}->{ale}->git->cat_async($smsg->{blob}, \&git_to_mail,
+ $self->{git}->cat_async($smsg->{blob}, \&git_to_mail,
[$self->{wcb}, $smsg]);
}
next prev parent reply other threads:[~2021-10-30 8:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-30 8:11 [PATCH 0/5] lei: fix various SIGPIPE problems Eric Wong
2021-10-30 8:11 ` [PATCH 1/5] lei: do not access {sock} after SIGPIPE Eric Wong
2021-10-30 8:11 ` [PATCH 2/5] lei_to_mail: limit workers for text, reply and v2 outputs Eric Wong
2021-10-30 8:11 ` [PATCH 3/5] lei_xsearch: quiet error message on SIG{PIPE,TERM} Eric Wong
2021-10-30 8:11 ` Eric Wong [this message]
2021-10-30 8:11 ` [PATCH 5/5] doc: lei-security: add a note about core dumps Eric Wong
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=20211030081144.1080-5-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.
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).