about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-06-30 22:19:39 +0000
committerEric Wong <e@80x24.org>2019-06-30 22:25:25 +0000
commit8472ccddd410a136b5aaa8bb886c7cf0dc302411 (patch)
treec5f33963c285a1e027ac8c89c8497c67df1e1e80
parent3eb26fe04dae68612c841e749abd2848ce78ae59 (diff)
downloadpublic-inbox-8472ccddd410a136b5aaa8bb886c7cf0dc302411.tar.gz
For users relying on socket activation via service manager (e.g.
systemd) and running multiple service instances (@1, @2),
we need to ensure configuration of the socket is NonBlocking.
Otherwise, service managers such as systemd may clear the
O_NONBLOCK flag for a small window where accept/accept4
blocks:

public-inbox-nntpd@1      |systemd         |public-inbox-nntpd@2
--------------------------+----------------+--------------------
F_SETFL,O_NONBLOCK|O_RDWR |                | (not running, yet)
                          |F_SETFL, O_RDWR |
                          |fork+exec @2... |
accept(...) # blocks!     |                |(started by systemd)
                          |                |F_SETFL,O_NONBLOCK|O_RDWR
                          |                |accept(...) non-blocking

It's a very small window where O_NONBLOCK can be cleared,
but it exists, and I finally hit it after many years.
-rw-r--r--lib/PublicInbox/Daemon.pm10
-rw-r--r--lib/PublicInbox/Listener.pm1
-rw-r--r--t/common.perl7
3 files changed, 14 insertions, 4 deletions
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 2b7ac266..2046a7f5 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -155,9 +155,9 @@ sub daemon_prepare ($) {
                 my $s = eval { $sock_pkg->new(%o) };
                 warn "error binding $l: $! ($@)\n" unless $s;
                 umask $prev;
-
                 if ($s) {
                         $listener_names{sockname($s)} = $s;
+                        $s->blocking(0);
                         push @listeners, $s;
                 }
         }
@@ -363,6 +363,14 @@ sub inherit () {
         foreach my $fd (3..$end) {
                 my $s = IO::Handle->new_from_fd($fd, 'r');
                 if (my $k = sockname($s)) {
+                        if ($s->blocking) {
+                                $s->blocking(0);
+                                warn <<"";
+Inherited socket (fd=$fd) is blocking, making it non-blocking.
+Set 'NonBlocking = true' in the systemd.service unit to avoid stalled
+processes when multiple service instances start.
+
+                        }
                         $listener_names{$k} = $s;
                         push @rv, $s;
                 } else {
diff --git a/lib/PublicInbox/Listener.pm b/lib/PublicInbox/Listener.pm
index 594dabb8..60428934 100644
--- a/lib/PublicInbox/Listener.pm
+++ b/lib/PublicInbox/Listener.pm
@@ -16,7 +16,6 @@ sub new ($$$) {
         setsockopt($s, SOL_SOCKET, SO_KEEPALIVE, 1);
         setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1); # ignore errors on non-TCP
         listen($s, 1024);
-        IO::Handle::blocking($s, 0);
         my $self = fields::new($class);
         $self->SUPER::new($s, EPOLLIN|EPOLLET|EPOLLEXCLUSIVE);
         $self->{post_accept} = $cb;
diff --git a/t/common.perl b/t/common.perl
index 3f05b68a..91d65c5f 100644
--- a/t/common.perl
+++ b/t/common.perl
@@ -24,15 +24,18 @@ sub tcp_server () {
                 Proto => 'tcp',
                 Type => Socket::SOCK_STREAM(),
                 Listen => 1024,
+                Blocking => 0,
         )
 }
 
 sub unix_server ($) {
-        IO::Socket::UNIX->new(
+        my $s = IO::Socket::UNIX->new(
                 Listen => 1024,
                 Type => Socket::SOCK_STREAM(),
                 Local => $_[0],
-        )
+        );
+        $s->blocking(0);
+        $s;
 }
 
 sub spawn_listener {