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 /lib/PublicInbox/LeiXSearch.pm | |
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 'lib/PublicInbox/LeiXSearch.pm')
-rw-r--r-- | lib/PublicInbox/LeiXSearch.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index 5443188d..6c8dfe10 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -20,7 +20,7 @@ use PublicInbox::LEI; use Fcntl qw(SEEK_SET F_SETFL O_APPEND O_RDWR); use PublicInbox::ContentHash qw(git_sha); use POSIX qw(strftime); -use autodie qw(open read seek truncate); +use autodie qw(close open read seek truncate); use PublicInbox::Syscall qw($F_SETPIPE_SZ); sub new { @@ -543,6 +543,7 @@ sub do_query { pipe($lei->{startq}, $lei->{au_done}) or die "pipe: $!"; fcntl($lei->{startq}, $F_SETPIPE_SZ, 4096) if $F_SETPIPE_SZ; delete $l2m->{au_peers}; + close(delete $l2m->{-wq_s2}); # share wq_s1 with lei_xsearch } $self->wq_workers_start('lei_xsearch', undef, $lei->oldset, { lei => $lei }, |