* [PATCH 2/2] daemon: drop listeners early in master on graceful shutdown
2019-12-15 23:11 6% [PATCH 0/2] daemon: kill listener early at shutdown Eric Wong
@ 2019-12-15 23:11 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-12-15 23:11 UTC (permalink / raw)
To: meta
For users not relying on socket activation via systemd (or
similar), we want to drop listeners ASAP so another process
can bind to their address. While we're at it, disable
TTIN and HUP handlers since we have no chance of starting
usable workers without listeners.
---
lib/PublicInbox/Daemon.pm | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 842ff1cc..9db472a1 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -462,23 +462,27 @@ sub unlink_pid_file_safe_ish ($$) {
}
}
+sub master_quit ($) {
+ exit unless @listeners;
+ @listeners = ();
+ kill_workers($_[0]);
+}
+
sub master_loop {
pipe(my ($p0, $p1)) or die "failed to create parent-pipe: $!";
# 1031: F_SETPIPE_SZ, 4096: page size
fcntl($p1, 1031, 4096) if $^O eq 'linux';
my $set_workers = $worker_processes;
reopen_logs();
- my $quit = 0;
my $ignore_winch;
- my $quit_cb = sub { exit if $quit++; kill_workers($_[0]) };
my $sig = {
USR1 => sub { reopen_logs(); kill_workers($_[0]); },
USR2 => \&upgrade,
- QUIT => $quit_cb,
- INT => $quit_cb,
- TERM => $quit_cb,
+ QUIT => \&master_quit,
+ INT => \&master_quit,
+ TERM => \&master_quit,
WINCH => sub {
- return if $ignore_winch;
+ return if $ignore_winch || !@listeners;
if (-t STDIN || -t STDOUT || -t STDERR) {
$ignore_winch = 1;
warn <<EOF;
@@ -489,10 +493,12 @@ EOF
}
},
HUP => sub {
+ return unless @listeners;
$worker_processes = $set_workers;
kill_workers($_[0]);
},
TTIN => sub {
+ return unless @listeners;
if ($set_workers > $worker_processes) {
++$worker_processes;
} else {
@@ -509,7 +515,7 @@ EOF
sig_setmask($oldset) if !$sigfd;
while (1) { # main loop
my $n = scalar keys %pids;
- if ($quit) {
+ unless (@listeners) {
exit if $n == 0;
$set_workers = $worker_processes = $n = 0;
}
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] daemon: kill listener early at shutdown
@ 2019-12-15 23:11 6% Eric Wong
2019-12-15 23:11 7% ` [PATCH 2/2] daemon: drop listeners early in master on graceful shutdown Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-12-15 23:11 UTC (permalink / raw)
To: meta
Not everybody uses systemd (or similar) which allow socket
activation. So we now get rid of listeners ASAP during graceful
shutdown to ensure replacement processes can bind to the same
listen socket w/o requiring SO_REUSEPORT.
Eric Wong (2):
daemon: shorten lifetime of listener_names mapping
daemon: drop listeners early in master on graceful shutdown
lib/PublicInbox/Daemon.pm | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 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 --
2019-12-15 23:11 6% [PATCH 0/2] daemon: kill listener early at shutdown Eric Wong
2019-12-15 23:11 7% ` [PATCH 2/2] daemon: drop listeners early in master on graceful shutdown 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).