diff options
author | Eric Wong <e@80x24.org> | 2023-11-07 13:01:47 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2023-11-07 13:23:36 +0000 |
commit | e97a30e7624dfb8645aa33a94844bcf28c7e1379 (patch) | |
tree | 9f28b7273c795b0e0579d42728fdfad1e5dbfeac /t/lei-sigpipe.t | |
parent | c1f27d21213f05bd4656e24ec5a5a076ebaa6afd (diff) | |
download | public-inbox-e97a30e7624dfb8645aa33a94844bcf28c7e1379.tar.gz |
When dealing with large search results, we need to deal with EPIPE not just from the pager, but also EPIPE or ECONNRESET between lei_xsearch and lei2mail processes. Without this fix, lei_xsearch processes could linger and get stuck writing to dead lei2mail processes if a user aborts the pager early during a large result set. To ensure lei_xsearch processes don't linger around after lei2mail workers all die, we must close $l2m->{-wq_s2} before spawning lei_xsearch processes, since $l2m->{-wq_s2} is only used in lei2mail workers. For `git cat-file' processes, we also need to trigger PublicInbox::Git->close to handle unpredictable destructor ordering to avoid using uninitialized IO refs. This combines with the `git_to_mail' change to deal with process cleanup handling from premature shutdowns. To test all this, we can't just rely on a single message being large, but also need to rely on the result set being large enough to saturate the lei_xsearch -> lei2mail socket so we rely on GIANT_INBOX_DIR once again.
Diffstat (limited to 't/lei-sigpipe.t')
-rw-r--r-- | t/lei-sigpipe.t | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/t/lei-sigpipe.t b/t/lei-sigpipe.t index 622598a4..1aa700e9 100644 --- a/t/lei-sigpipe.t +++ b/t/lei-sigpipe.t @@ -7,6 +7,19 @@ use PublicInbox::TestCommon; use POSIX qw(WTERMSIG WIFSIGNALED SIGPIPE); use PublicInbox::OnDestroy; use PublicInbox::Syscall qw($F_SETPIPE_SZ); +use autodie qw(close open pipe seek sysread); +use PublicInbox::IO qw(write_file); +my $inboxdir = $ENV{GIANT_INBOX_DIR}; +SKIP: { + $inboxdir // skip 'GIANT_INBOX_DIR unset to test large results'; + require PublicInbox::Inbox; + my $ibx = PublicInbox::Inbox->new({ + name => 'unconfigured-test', + address => [ "test\@example.com" ], + inboxdir => $inboxdir, + }); + $ibx->search or xbail "GIANT_INBOX_DIR=$inboxdir has no search"; +} # undo systemd (and similar) ignoring SIGPIPE, since lei expects to be run # from an interactive terminal: @@ -21,30 +34,30 @@ test_lei(sub { my $f = "$ENV{HOME}/big.eml"; my $imported; for my $out ([], [qw(-f mboxcl2)], [qw(-f text)]) { - pipe(my ($r, $w)) or BAIL_OUT $!; + pipe(my $r, my $w); my $size = $F_SETPIPE_SZ && fcntl($w, $F_SETPIPE_SZ, 4096) ? 4096 : 65536; unless (-f $f) { - open my $fh, '>', $f or xbail "open $f: $!"; - print $fh <<'EOM' or xbail; + my $fh = write_file '>', $f, <<'EOM'; From: big@example.com Message-ID: <big@example.com> EOM print $fh 'Subject:'; print $fh (' '.('x' x 72)."\n") x (($size / 73) + 1); print $fh "\nbody\n"; - close $fh or xbail "close: $!"; + close $fh; } lei_ok(qw(import), $f) if $imported++ == 0; - open my $errfh, '+>>', "$ENV{HOME}/stderr.log" or xbail $!; + open my $errfh, '+>>', "$ENV{HOME}/stderr.log"; my $opt = { run_mode => 0, 2 => $errfh, 1 => $w }; my $cmd = [qw(lei q -q -t), @$out, 'z:1..']; + push @$cmd, '--only='.$inboxdir if defined $inboxdir; my $tp = start_script($cmd, undef, $opt); close $w; vec(my $rvec = '', fileno($r), 1) = 1; if (!select($rvec, undef, undef, 30)) { - seek($errfh, 0, 0) or xbail $!; + seek($errfh, 0, 0); my $s = do { local $/; <$errfh> }; xbail "lei q had no output after 30s, stderr=$s"; } @@ -53,7 +66,7 @@ EOM $tp->join; ok(WIFSIGNALED($?), "signaled @$out"); is(WTERMSIG($?), SIGPIPE, "got SIGPIPE @$out"); - seek($errfh, 0, 0) or xbail $!; + seek($errfh, 0, 0); my $s = do { local $/; <$errfh> }; is($s, '', "quiet after sigpipe @$out"); } |