From: Eric Wong <e@80x24.org>
Date: Tue, 20 Aug 2024 10:35:21 +0000 (+0000)
Subject: lei_xsearch: allow signals during long queries
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf7a240bdddb849de884d39cd536f53b98b44bd4;p=thirdparty%2Fpublic-inbox.git

lei_xsearch: allow signals during long queries

Xapian ->mset, remote Xapian calls via remote inboxes, and
lcat dumps can take a long time via wq_io_do and hold
lei_xsearch processes open for too long after a client
disconnects prematurely.

This fixes wait_for_eof shutdown timeouts on the lei-daemon quit
pipe when running t/lei-sigpipe.t with GIANT_INBOX_DIR pointed
to a meta@public-inbox.org mirror on my old laptop.
---

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 43dedd106..e20b13c6b 100644
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -150,6 +150,7 @@ sub mset_progress {
 sub query_one_mset { # for --threads and l2m w/o sort
 	my ($self, $ibxish) = @_;
 	my $lei = $self->{lei};
+	my $allow_sigs = PublicInbox::DS::allow_sigs qw(INT QUIT TERM);
 	my ($srch, $over) = ($ibxish->search, $ibxish->over);
 	my $dir = $ibxish->{inboxdir} // $ibxish->{topdir};
 	return warn("$dir not indexed by Xapian\n") unless ($srch && $over);
@@ -223,6 +224,7 @@ sub query_one_mset { # for --threads and l2m w/o sort
 sub query_combined_mset { # non-parallel for non-"--threads" users
 	my ($self) = @_;
 	my $lei = $self->{lei};
+	my $allow_sigs = PublicInbox::DS::allow_sigs qw(INT QUIT TERM);
 	my $mo = { %{$lei->{mset_opt}} };
 	local $0 = "$0 C $mo->{qstr}";
 	my $mset;
@@ -317,6 +319,7 @@ sub fudge_qstr_time ($$$) {
 sub query_remote_mboxrd {
 	my ($self, $uris) = @_;
 	local $SIG{TERM} = sub { exit(0) }; # for DESTROY (File::Temp, $reap)
+	my $allow_sigs = PublicInbox::DS::allow_sigs qw(INT QUIT TERM);
 	my $lei = $self->{lei};
 	my $opt = $lei->{opt};
 	my $qstr = $lei->{mset_opt}->{qstr};
@@ -633,6 +636,7 @@ sub _lcat2smsg { # git->cat_async callback
 sub lcat_dump { # via wq_io_do
 	my ($self) = @_;
 	my $lei = $self->{lei};
+	my $allow_sigs = PublicInbox::DS::allow_sigs qw(INT QUIT TERM);
 	my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei);
 	my $git = $lei->{ale}->git;
 	if (!$lei->{l2m}) {