use warnings;
use Test::More;
use Time::HiRes qw(gettimeofday tv_interval);
-
-foreach my $mod (qw(Plack::Util Plack::Builder
- HTTP::Date HTTP::Status IPC::Run)) {
- eval "require $mod";
- plan skip_all => "$mod missing for httpd-corner.t" if $@;
-}
-
+use PublicInbox::Spawn qw(which spawn);
+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();
+my $sock = tcp_server() or die;
+
+# make sure stdin is not a pipe for lsof test to check for leaking pipes
+open(STDIN, '<', '/dev/null') or die 'no /dev/null: $!';
# 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 });
};
-{
- ok($sock, 'sock created');
- $spawn_httpd->('-W0');
+$spawn_httpd->();
+if ('test worker death') {
+ my $conn = conn_for($sock, 'killed worker');
+ $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(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');
}
{
$conn->write($payload . "\r\n0\r\n\r\nGET /empty HTTP/1.0\r\n\r\n");
$conn->read(my $buf, 4096);
my $lim = 0;
- $lim++ while ($conn->read($buf, 4096, bytes::length($buf)) && $lim < 9);
+ $lim++ while ($conn->read($buf, 4096, length($buf)) && $lim < 9);
my $exp = sha1_hex($payload);
like($buf, qr!\r\n\r\n${exp}HTTP/1\.0 200 OK\r\n!s,
'chunk parser can handled pipelined requests');
}
sub conn_for {
- my ($sock, $msg) = @_;
- my $conn = IO::Socket::INET->new(
- PeerAddr => $sock->sockhost,
- PeerPort => $sock->sockport,
- Proto => 'tcp',
- Type => SOCK_STREAM);
+ my ($dest, $msg) = @_;
+ my $conn = tcp_connect($dest);
ok($conn, "connected for $msg");
- $conn->autoflush(1);
setsockopt($conn, IPPROTO_TCP, TCP_NODELAY, 1);
return $conn;
}
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');
}
};
SKIP: {
- my $have_curl = 0;
- foreach my $p (split(':', $ENV{PATH})) {
- -x "$p/curl" or next;
- $have_curl = 1;
- last;
- }
- my $ntest = 4;
- $have_curl or skip('curl(1) missing', $ntest);
+ which('curl') or skip('curl(1) missing', 4);
my $base = 'http://' . $sock->sockhost . ':' . $sock->sockport;
my $url = "$base/sha1";
my ($r, $w);
pipe($r, $w) or die "pipe: $!";
my $cmd = [qw(curl --tcp-nodelay --no-buffer -T- -HExpect: -sS), $url];
- my ($out, $err) = ('', '');
- my $h = IPC::Run::start($cmd, $r, \$out, \$err);
- $w->autoflush(1);
+ open my $cout, '+>', undef or die;
+ open my $cerr, '>', undef or die;
+ 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') {
print $w $c or die "failed to write to curl: $!";
delay();
}
close $w or die "close write pipe: $!";
- close $r or die "close read pipe: $!";
- IPC::Run::finish($h);
+ waitpid($pid, 0);
is($?, 0, 'curl exited successfully');
- is($err, '', 'no errors from curl');
- is($out, sha1_hex($str), 'read expected body');
+ is(-s $cerr, 0, 'no errors from curl');
+ $cout->seek(0, SEEK_SET);
+ is(<$cout>, sha1_hex($str), 'read expected body');
open my $fh, '-|', qw(curl -sS), "$base/async-big" or die $!;
my $n = 0;
$n += $r;
$buf =~ /\A\0+\z/ or $non_zero++;
}
+ close $fh or die "curl errored out \$?=$?";
is($n, 30 * 1024 * 1024, 'got expected output from curl');
is($non_zero, 0, 'read all zeros');
}
$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');
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 $td->{pid}`;
+ is_deeply([grep(/\bdeleted\b/, @lsof)], [], 'no lingering deleted inputs');
+
+ # 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();
sub capture {