use Test::More;
use Time::HiRes qw(gettimeofday tv_interval);
use PublicInbox::Spawn qw(which spawn);
-
-foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
- eval "require $mod";
- plan skip_all => "$mod missing for httpd-corner.t" if $@;
-}
-
+use PublicInbox::TestCommon;
+require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
use Digest::SHA qw(sha1_hex);
-use File::Temp qw/tempdir/;
use IO::Socket;
use IO::Socket::UNIX;
use Fcntl qw(:seek);
use Socket qw(IPPROTO_TCP TCP_NODELAY SOL_SOCKET);
use POSIX qw(mkfifo);
-require './t/common.perl';
-my $tmpdir = tempdir('httpd-corner-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
my $fifo = "$tmpdir/fifo";
ok(defined mkfifo($fifo, 0777), 'created FIFO');
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
-my $httpd = 'blib/script/public-inbox-httpd';
my $psgi = "./t/httpd-corner.psgi";
my $sock = tcp_server() or die;
# Make sure we don't clobber socket options set by systemd or similar
# using socket activation:
-my ($defer_accept_val, $accf_arg);
+my ($defer_accept_val, $accf_arg, $TCP_DEFER_ACCEPT);
if ($^O eq 'linux') {
- setsockopt($sock, IPPROTO_TCP, Socket::TCP_DEFER_ACCEPT(), 5) or die;
- my $x = getsockopt($sock, IPPROTO_TCP, Socket::TCP_DEFER_ACCEPT());
+ $TCP_DEFER_ACCEPT = eval { Socket::TCP_DEFER_ACCEPT() } // 9;
+ setsockopt($sock, IPPROTO_TCP, $TCP_DEFER_ACCEPT, 5) or die;
+ my $x = getsockopt($sock, IPPROTO_TCP, $TCP_DEFER_ACCEPT);
defined $x or die "getsockopt: $!";
$defer_accept_val = unpack('i', $x);
if ($defer_accept_val <= 0) {
setsockopt($sock, SOL_SOCKET, $var, $accf_arg) or die "setsockopt: $!";
}
+sub unix_server ($) {
+ my $s = IO::Socket::UNIX->new(
+ Listen => 1024,
+ Type => Socket::SOCK_STREAM(),
+ Local => $_[0],
+ );
+ $s->blocking(0);
+ $s;
+}
+
my $upath = "$tmpdir/s";
my $unix = unix_server($upath);
ok($unix, 'UNIX socket created');
-my $pid;
-END { kill 'TERM', $pid if defined $pid };
+my $td;
my $spawn_httpd = sub {
my (@args) = @_;
- my $cmd = [ $httpd, @args, "--stdout=$out", "--stderr=$err", $psgi ];
- $pid = spawn_listener(undef, $cmd, [ $sock, $unix ]);
- ok(defined $pid, 'forked httpd process successfully');
+ my $cmd = [ '-httpd', @args, "--stdout=$out", "--stderr=$err", $psgi ];
+ $td = start_script($cmd, undef, { 3 => $sock, 4 => $unix });
};
$spawn_httpd->();
if ('test worker death') {
my $conn = conn_for($sock, 'killed worker');
- $conn->write("GET /pid HTTP/1.0\r\n\r\n");
- ok($conn->read(my $buf, 8192), 'read response');
- my ($head, $body) = split(/\r\n\r\n/, $buf);
- like($body, qr/\A[0-9]+\z/, '/pid response');
- my $pid = $body;
+ $conn->write("GET /pid HTTP/1.1\r\nHost:example.com\r\n\r\n");
+ my $pid;
+ while (defined(my $line = $conn->getline)) {
+ next unless $line eq "\r\n";
+ chomp($pid = $conn->getline);
+ last;
+ }
+ like($pid, qr/\A[0-9]+\z/, '/pid response');
is(kill('KILL', $pid), 1, 'killed worker');
+ is($conn->getline, undef, 'worker died and EOF-ed client');
$conn = conn_for($sock, 'respawned worker');
$conn->write("GET /pid HTTP/1.0\r\n\r\n");
- ok($conn->read($buf, 8192), 'read response');
- ($head, $body) = split(/\r\n\r\n/, $buf);
+ ok($conn->read(my $buf, 8192), 'read response');
+ my ($head, $body) = split(/\r\n\r\n/, $buf);
+ chomp($body);
like($body, qr/\A[0-9]+\z/, '/pid response');
isnt($body, $pid, 'respawned worker');
}
open my $f, '>', $fifo or die "open $fifo: $!\n";
$f->autoflush(1);
ok(print($f "hello\n"), 'wrote something to fifo');
- my $kpid = $pid;
- $pid = undef;
- is(kill('TERM', $kpid), 1, 'started graceful shutdown');
+ is($td->kill, 1, 'started graceful shutdown');
ok(print($f "world\n"), 'wrote else to fifo');
close $f or die "close fifo: $!\n";
$conn->read(my $buf, 8192);
my ($head, $body) = split(/\r\n\r\n/, $buf, 2);
like($head, qr!\AHTTP/1\.[01] 200 OK!, 'got 200 for slow-header');
is($body, "hello\nworld\n", 'read expected body');
- is(waitpid($kpid, 0), $kpid, 'reaped httpd');
+ $td->join;
is($?, 0, 'no error');
$spawn_httpd->('-W0');
}
$conn->sysread($buf, 8192);
is($buf, $c, 'got trickle for reading');
}
- my $kpid = $pid;
- $pid = undef;
- is(kill('TERM', $kpid), 1, 'started graceful shutdown');
+ is($td->kill, 1, 'started graceful shutdown');
ok(print($f "world\n"), 'wrote else to fifo');
close $f or die "close fifo: $!\n";
$conn->sysread($buf, 8192);
is($buf, "world\n", 'read expected body');
is($conn->sysread($buf, 8192), 0, 'got EOF from server');
- is(waitpid($kpid, 0), $kpid, 'reaped httpd');
+ $td->join;
is($?, 0, 'no error');
$spawn_httpd->('-W0');
}
my $cmd = [qw(curl --tcp-nodelay --no-buffer -T- -HExpect: -sS), $url];
open my $cout, '+>', undef or die;
open my $cerr, '>', undef or die;
- my $rdr = { 0 => fileno($r), 1 => fileno($cout), 2 => fileno($cerr) };
+ my $rdr = { 0 => $r, 1 => $cout, 2 => $cerr };
my $pid = spawn($cmd, undef, $rdr);
close $r or die "close read pipe: $!";
foreach my $c ('a'..'z') {
$conn->write("Content-Length: $len\r\n");
delay();
$conn->write("\r\n");
- my $kpid = $pid;
- $pid = undef;
- is(kill('TERM', $kpid), 1, 'started graceful shutdown');
+ is($td->kill, 1, 'started graceful shutdown');
delay();
my $n = 0;
foreach my $c ('a'..'z') {
}
is($n, $len, 'wrote alphabet');
$check_self->($conn);
- is(waitpid($kpid, 0), $kpid, 'reaped httpd');
+ $td->join;
is($?, 0, 'no error');
$spawn_httpd->('-W0');
}
SKIP: {
skip 'TCP_DEFER_ACCEPT is Linux-only', 1 if $^O ne 'linux';
- my $var = Socket::TCP_DEFER_ACCEPT();
+ my $var = $TCP_DEFER_ACCEPT;
defined(my $x = getsockopt($sock, IPPROTO_TCP, $var)) or die;
is(unpack('i', $x), $defer_accept_val,
'TCP_DEFER_ACCEPT unchanged if previously set');
defined(my $x = getsockopt($sock, SOL_SOCKET, $var)) or die;
is($x, $accf_arg, 'SO_ACCEPTFILTER unchanged if previously set');
};
+
SKIP: {
skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux';
skip 'no lsof in PATH', 1 unless which('lsof');
- my @lsof = `lsof -p $pid`;
+ my @lsof = `lsof -p $td->{pid}`;
is_deeply([grep(/\bdeleted\b/, @lsof)], [], 'no lingering deleted inputs');
- is_deeply([grep(/\bpipe\b/, @lsof)], [], 'no extra pipes with -W0');
+
+ # filter out pipes inherited from the parent
+ my @this = `lsof -p $$`;
+ my $bad;
+ my $extract_inodes = sub {
+ map {;
+ my @f = split(' ', $_);
+ my $inode = $f[-2];
+ $bad = $_ if $inode !~ /\A[0-9]+\z/;
+ $inode => 1;
+ } grep (/\bpipe\b/, @_);
+ };
+ my %child = $extract_inodes->(@lsof);
+ my %parent = $extract_inodes->(@this);
+ skip("inode not in expected format: $bad", 1) if defined($bad);
+ delete @child{(keys %parent)};
+ is_deeply([], [keys %child], 'no extra pipes with -W0');
};
done_testing();