X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd-unix.t;h=363f36489931ee5bcb5e7bf5ee066809c5abe055;hb=03c9119ec613fa43dcf0a50b5f35754f13228bc8;hp=5ec70fd8f1836f74e7ccd7c239115e6db81eb74a;hpb=e05912ae3899a0f50a6baf3b6c1892789d24f6b1;p=public-inbox.git
diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index 5ec70fd8..363f3648 100644
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -1,20 +1,16 @@
-# Copyright (C) 2016-2019 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
# Tests for binding Unix domain sockets
use strict;
use warnings;
use Test::More;
-require './t/common.perl';
+use PublicInbox::TestCommon;
use Errno qw(EADDRINUSE);
-
-foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
- eval "require $mod";
- plan skip_all => "$mod missing for httpd-unix.t" if $@;
-}
-
-use File::Temp qw/tempdir/;
+use Cwd qw(abs_path);
+use Carp qw(croak);
+require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
use IO::Socket::UNIX;
-my $tmpdir = tempdir('httpd-unix-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
my $unix = "$tmpdir/unix.sock";
my $psgi = './t/httpd-corner.psgi';
my $out = "$tmpdir/out.log";
@@ -23,7 +19,6 @@ my $td;
my $spawn_httpd = sub {
my (@args) = @_;
- push @args, '-W0';
my $cmd = [ '-httpd', @args, "--stdout=$out", "--stderr=$err", $psgi ];
$td = start_script($cmd);
};
@@ -37,7 +32,7 @@ my $spawn_httpd = sub {
}
ok(!-S $unix, 'UNIX socket does not exist, yet');
-$spawn_httpd->("-l$unix");
+$spawn_httpd->("-l$unix", '-W0');
my %o = (Peer => $unix, Type => SOCK_STREAM);
for (1..1000) {
last if -S $unix && IO::Socket::UNIX->new(%o);
@@ -60,7 +55,7 @@ sub check_sock ($) {
check_sock($unix);
{ # do not clobber existing socket
- my %err = ( 'linux' => EADDRINUSE );
+ my %err = ( 'linux' => EADDRINUSE, 'freebsd' => EADDRINUSE );
open my $out, '>>', "$tmpdir/1" or die "redirect failed: $!";
open my $err, '>>', "$tmpdir/2" or die "redirect failed: $!";
my $cmd = ['-httpd', '-l', $unix, '-W0', $psgi];
@@ -86,28 +81,122 @@ check_sock($unix);
ok(-S $unix, 'unix socket still exists');
}
+# portable Perl can delay or miss signal dispatches due to races,
+# so disable some tests on systems lacking signalfd(2) or EVFILT_SIGNAL
+my $has_sigfd = PublicInbox::Sigfd->new({}, 0) ? 1 : $ENV{TEST_UNRELIABLE};
+
+sub delay_until {
+ my $cond = shift;
+ my $end = time + 30;
+ do {
+ return if $cond->();
+ select undef, undef, undef, 0.012;
+ } until (time > $end);
+ Carp::confess('condition failed');
+}
+
SKIP: {
- eval 'require Net::Server::Daemonize';
- skip('Net::Server missing for pid-file/daemonization test', 10) if $@;
+ require_mods('Net::Server::Daemonize', 52);
+ $has_sigfd or skip('signalfd / EVFILT_SIGNAL not available', 52);
+ my $pid_file = "$tmpdir/pid";
+ my $read_pid = sub {
+ my $f = shift;
+ open my $fh, '<', $f or die "open $f failed: $!";
+ my $pid = do { local $/; <$fh> };
+ chomp($pid) or die("pid file not ready $!");
+ $pid;
+ };
- # wait for daemonization
- $spawn_httpd->("-l$unix", '-D', '-P', "$tmpdir/pid");
+ for my $w (qw(-W0 -W1)) {
+ # wait for daemonization
+ $spawn_httpd->("-l$unix", '-D', '-P', $pid_file, $w);
+ $td->join;
+ is($?, 0, "daemonized $w process");
+ check_sock($unix);
+ ok(-s $pid_file, "$w pid file written");
+ my $pid = $read_pid->($pid_file);
+ is(kill('TERM', $pid), 1, "signaled daemonized $w process");
+ delay_until(sub { !kill(0, $pid) });
+ is(kill(0, $pid), 0, "daemonized $w process exited");
+ ok(!-e $pid_file, "$w pid file unlinked at exit");
+ }
+
+ # try a USR2 upgrade with workers:
+ my $httpd = abs_path('blib/script/public-inbox-httpd');
+ $psgi = abs_path($psgi);
+ my $opt = { run_mode => 0 };
+
+ my @args = ("-l$unix", '-D', '-P', $pid_file, -1, $out, -2, $err);
+ $td = start_script([$httpd, @args, $psgi], undef, $opt);
$td->join;
- is($?, 0, 'daemonized process OK');
+ is($?, 0, "daemonized process again");
check_sock($unix);
+ ok(-s $pid_file, 'pid file written');
+ my $pid = $read_pid->($pid_file);
- ok(-f "$tmpdir/pid", 'pid file written');
- open my $fh, '<', "$tmpdir/pid" or die "open failed: $!";
- local $/ = "\n";
- my $rpid = <$fh>;
- chomp $rpid;
- like($rpid, qr/\A\d+\z/s, 'pid file looks like a pid');
- is(kill('TERM', $rpid), 1, 'signalled daemonized process');
- for (1..100) {
- kill(0, $rpid) or last;
- select undef, undef, undef, 0.02;
- }
- is(kill(0, $rpid), 0, 'daemonized process exited')
+ # stop worker to ensure check_sock below hits $new_pid
+ kill('TTOU', $pid) or die "TTOU failed: $!";
+
+ kill('USR2', $pid) or die "USR2 failed: $!";
+ delay_until(sub {
+ $pid != (eval { $read_pid->($pid_file) } // $pid)
+ });
+ my $new_pid = $read_pid->($pid_file);
+ isnt($new_pid, $pid, 'new child started');
+ ok($new_pid > 0, '$new_pid valid');
+ delay_until(sub { -s "$pid_file.oldbin" });
+ my $old_pid = $read_pid->("$pid_file.oldbin");
+ is($old_pid, $pid, '.oldbin pid file written');
+ ok($old_pid > 0, '$old_pid valid');
+
+ check_sock($unix); # ensures $new_pid is ready to receive signals
+
+ # first, back out of the upgrade
+ kill('QUIT', $new_pid) or die "kill new PID failed: $!";
+ delay_until(sub {
+ $pid == (eval { $read_pid->($pid_file) } // 0)
+ });
+ is($read_pid->($pid_file), $pid, 'old PID file restored');
+ ok(!-f "$pid_file.oldbin", '.oldbin PID file gone');
+
+ # retry USR2 upgrade
+ kill('USR2', $pid) or die "USR2 failed: $!";
+ delay_until(sub {
+ $pid != (eval { $read_pid->($pid_file) } // $pid)
+ });
+ $new_pid = $read_pid->($pid_file);
+ isnt($new_pid, $pid, 'new child started again');
+ $old_pid = $read_pid->("$pid_file.oldbin");
+ is($old_pid, $pid, '.oldbin pid file written');
+
+ # drop the old parent
+ kill('QUIT', $old_pid) or die "QUIT failed: $!";
+ delay_until(sub { !kill(0, $old_pid) });
+ ok(!-f "$pid_file.oldbin", '.oldbin PID file gone');
+
+ # drop the new child
+ check_sock($unix);
+ kill('QUIT', $new_pid) or die "QUIT failed: $!";
+ delay_until(sub { !kill(0, $new_pid) });
+ ok(!-f $pid_file, 'PID file is gone');
+
+
+ # try USR2 without workers (-W0)
+ $td = start_script([$httpd, @args, '-W0', $psgi], undef, $opt);
+ $td->join;
+ is($?, 0, 'daemonized w/o workers');
+ check_sock($unix);
+ $pid = $read_pid->($pid_file);
+
+ # replace running process
+ kill('USR2', $pid) or die "USR2 failed: $!";
+ delay_until(sub { !kill(0, $pid) });
+
+ check_sock($unix);
+ $pid = $read_pid->($pid_file);
+ kill('QUIT', $pid) or die "USR2 failed: $!";
+ delay_until(sub { !kill(0, $pid) });
+ ok(!-f $pid_file, 'PID file is gone');
}
done_testing();