* [PATCH 3/3] watch: reset HUP + USR1 signal handlers in children
2023-09-08 10:51 6% [PATCH 0/3] sig handling fixes for non-signalfd/kqueue Eric Wong
@ 2023-09-08 10:51 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-09-08 10:51 UTC (permalink / raw)
To: meta
Child processes handling IMAP/NNTP aren't going to want
to handle config reloads nor forced rescans, those are
exclusively for the parent. We'll leave a note that
QUIT/TERM/INT can safely use the same callback for both
parent and children, as I nearly made the mistake of
resetting those to their default values in the child.
---
lib/PublicInbox/Watch.pm | 7 ++++---
script/public-inbox-watch | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index a2dc125f..cf0720e3 100644
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -250,7 +250,7 @@ sub quit_done ($) {
$live == 0;
}
-sub quit {
+sub quit { # may be called in IMAP/NNTP children
my ($self) = @_;
$self->{quit} = 1;
%{$self->{opendirs}} = ();
@@ -260,7 +260,7 @@ sub quit {
my $di = $PublicInbox::DS::DescriptorMap{$fd};
$di->close if $di && $di->can('add_watches');
}
- if (my $idle_mic = delete $self->{idle_mic}) {
+ if (my $idle_mic = delete $self->{idle_mic}) { # IMAP child
return unless $idle_mic->IsConnected && $idle_mic->Socket;
eval { $idle_mic->done };
if ($@ && $idle_mic->IsConnected && $idle_mic->Socket) {
@@ -387,7 +387,8 @@ sub watch_atfork_child ($) {
delete $self->{opendirs};
PublicInbox::DS->Reset;
my $sig = delete $self->{sig};
- $sig->{CHLD} = 'DEFAULT';
+ $sig->{CHLD} = $sig->{HUP} = $sig->{USR1} = 'DEFAULT';
+ # TERM/QUIT/INT call ->quit, which works in both parent+child
@SIG{keys %$sig} = values %$sig;
PublicInbox::DS::sig_setmask(PublicInbox::DS::allowset($sig));
}
diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index 870cd31b..d9215de9 100755
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -41,7 +41,7 @@ if ($watch) {
warn "# scanning\n";
$watch->trigger_scan('full');
};
- my $quit = sub {
+ my $quit = sub { # may be called in IMAP/NNTP children
$watch->quit if $watch;
$watch = undef;
$0 .= ' quitting';
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] sig handling fixes for non-signalfd/kqueue
@ 2023-09-08 10:51 6% Eric Wong
2023-09-08 10:51 7% ` [PATCH 3/3] watch: reset HUP + USR1 signal handlers in children Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-09-08 10:51 UTC (permalink / raw)
To: meta
The first two fix t/imapd.t getting stuck when waiting for
-watch to reload after setting imap.pollInterval. This only
affects non-Linux users without IO::KQueue installed.
3/3 doesn't fix anything exposed in tests, but is defense
against PID typos by someone trying to trigger a reload/rescan
on the toplevel -watch process.
Eric Wong (3):
ds: unblock signals for non-signalfd/kqueue correctly
watch: set %SIG for non-signalfd/kqueue
watch: reset HUP + USR1 signal handlers in children
lib/PublicInbox/DS.pm | 16 ++++++++++------
lib/PublicInbox/Watch.pm | 7 ++++---
script/public-inbox-watch | 3 ++-
3 files changed, 16 insertions(+), 10 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-09-08 10:51 6% [PATCH 0/3] sig handling fixes for non-signalfd/kqueue Eric Wong
2023-09-08 10:51 7% ` [PATCH 3/3] watch: reset HUP + USR1 signal handlers in children Eric Wong
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).