X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiXSearch.pm;h=1e5d7ca6b2f106ffdfcd10614545a5dacce6ad06;hb=cfc2f64069e245a700b60113705be477857c51e5;hp=5cf02136ba42ae012182e37f64892ce08a2ae26e;hpb=c27867da3ad7025a30e923414343262b035ed133;p=public-inbox.git diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index 5cf02136..1e5d7ca6 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -8,9 +8,8 @@ package PublicInbox::LeiXSearch; use strict; use v5.10.1; use parent qw(PublicInbox::LeiSearch PublicInbox::IPC); -use PublicInbox::DS qw(dwaitpid now); +use PublicInbox::DS qw(now); use PublicInbox::PktOp qw(pkt_do); -use PublicInbox::Import; use File::Temp 0.19 (); # 0.19 for ->newdir use File::Spec (); use PublicInbox::Search qw(xap_terms); @@ -107,12 +106,23 @@ sub wait_startq ($) { read($startq, my $query_prepare_done, 1); } +sub mset_progress { + my $lei = shift; + return unless $lei->{-progress}; + if ($lei->{pkt_op_p}) { + pkt_do($lei->{pkt_op_p}, 'mset_progress', @_); + } else { # single lei-daemon consumer + my ($desc, $mset_size, $mset_total_est) = @_; + $lei->{-mset_total} += $mset_size; + $lei->err("# $desc $mset_size/$mset_total_est"); + } +} + sub query_thread_mset { # for --thread - my ($self, $lei, $ibxish) = @_; + my ($self, $ibxish) = @_; local $0 = "$0 query_thread_mset"; - $lei->atfork_child_wq($self); + my $lei = $self->{lei}; my $startq = delete $lei->{startq}; - my ($srch, $over) = ($ibxish->search, $ibxish->over); my $desc = $ibxish->{inboxdir} // $ibxish->{topdir}; return warn("$desc not indexed by Xapian\n") unless ($srch && $over); @@ -121,7 +131,7 @@ sub query_thread_mset { # for --thread my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $ibxish); do { $mset = $srch->mset($mo->{qstr}, $mo); - pkt_do($lei->{pkt_op}, 'mset_progress', $desc, $mset->size, + mset_progress($lei, $desc, $mset->size, $mset->get_matches_estimated); my $ids = $srch->mset_to_artnums($mset, $mo); my $ctx = { ids => $ids }; @@ -142,9 +152,9 @@ sub query_thread_mset { # for --thread } sub query_mset { # non-parallel for non-"--thread" users - my ($self, $lei) = @_; + my ($self) = @_; local $0 = "$0 query_mset"; - $lei->atfork_child_wq($self); + my $lei = $self->{lei}; my $startq = delete $lei->{startq}; my $mo = { %{$lei->{mset_opt}} }; my $mset; @@ -154,7 +164,7 @@ sub query_mset { # non-parallel for non-"--thread" users my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $self); do { $mset = $self->mset($mo->{qstr}, $mo); - pkt_do($lei->{pkt_op}, 'mset_progress', 'xsearch', + mset_progress($lei, 'xsearch', $mset->size, $mset->size, $mset->get_matches_estimated); for my $mitem ($mset->items) { my $smsg = smsg_for($self, $mitem) or next; @@ -174,8 +184,8 @@ sub each_eml { # callback for MboxReader->mboxrd $smsg->{$_} //= '' for qw(from to cc ds subject references mid); delete @$smsg{qw(From Subject -ds -ts)}; if (my $startq = delete($lei->{startq})) { wait_startq($startq) } - ++$lei->{-nr_remote_eml}; - if (!$lei->{opt}->{quiet}) { + if ($lei->{-progress}) { + ++$lei->{-nr_remote_eml}; my $now = now(); my $next = $lei->{-next_progress} //= ($now + 1); if ($now > $next) { @@ -195,13 +205,13 @@ sub kill_reap { } sub query_remote_mboxrd { - my ($self, $lei, $uris) = @_; + my ($self, $uris) = @_; local $0 = "$0 query_remote_mboxrd"; - $lei->atfork_child_wq($self); + local $SIG{TERM} = sub { exit(0) }; # for DESTROY (File::Temp, $reap) + my $lei = $self->{lei}; my ($opt, $env) = @$lei{qw(opt env)}; my @qform = (q => $lei->{mset_opt}->{qstr}, x => 'm'); push(@qform, t => 1) if $opt->{thread}; - my @cmd = ($self->{curl}, qw(-sSf -d), ''); my $verbose = $opt->{verbose}; my $reap; my $cerr = File::Temp->new(TEMPLATE => 'curl.err-XXXX', TMPDIR => 1); @@ -212,56 +222,27 @@ sub query_remote_mboxrd { # spawn a process to force line-buffering, otherwise curl # will write 1 character at-a-time and parallel outputs # mmmaaayyy llloookkk llliiikkkeee ttthhhiiisss - push @cmd, '-v'; my $o = { 1 => $lei->{2}, 2 => $lei->{2} }; my $pid = spawn(['tail', '-f', $cerr->filename], undef, $o); $reap = PublicInbox::OnDestroy->new(\&kill_reap, $pid); } - for my $o ($lei->curl_opt) { - $o =~ s/\|[a-z0-9]\b//i; # remove single char short option - if ($o =~ s/=[is]@\z//) { - my $ary = $opt->{$o} or next; - push @cmd, map { ("--$o", $_) } @$ary; - } elsif ($o =~ s/=[is]\z//) { - my $val = $opt->{$o} // next; - push @cmd, "--$o", $val; - } elsif ($opt->{$o}) { - push @cmd, "--$o"; - } - } - $opt->{torsocks} = 'false' if $opt->{'no-torsocks'}; - my $tor = $opt->{torsocks} //= 'auto'; + my $curl = PublicInbox::LeiCurl->new($lei, $self->{curl}) or return; + push @$curl, '-s', '-d', ''; my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei); for my $uri (@$uris) { $lei->{-current_url} = $uri->as_string; $lei->{-nr_remote_eml} = 0; $uri->query_form(@qform); - my $cmd = [ @cmd, $uri->as_string ]; - if ($tor eq 'auto' && substr($uri->host, -6) eq '.onion' && - (($env->{LD_PRELOAD}//'') !~ /torsocks/)) { - unshift @$cmd, which('torsocks'); - } elsif (PublicInbox::Config::git_bool($tor)) { - unshift @$cmd, which('torsocks'); - } - - # continue anyways if torsocks is missing; a proxy may be - # specified via CLI, curlrc, environment variable, or even - # firewall rule - shift(@$cmd) if !$cmd->[0]; - + my $cmd = $curl->for_uri($lei, $uri); $lei->err("# @$cmd") if $verbose; - $? = 0; - my $fh = popen_rd($cmd, $env, $rdr); + my ($fh, $pid) = popen_rd($cmd, $env, $rdr); $fh = IO::Uncompress::Gunzip->new($fh); - eval { - PublicInbox::MboxReader->mboxrd($fh, \&each_eml, $self, - $lei, $each_smsg); - }; - return $lei->fail("E: @$cmd: $@") if $@; + PublicInbox::MboxReader->mboxrd($fh, \&each_eml, $self, + $lei, $each_smsg); + waitpid($pid, 0) == $pid or die "BUG: waitpid (curl): $!"; if ($? == 0) { my $nr = $lei->{-nr_remote_eml}; - pkt_do($lei->{pkt_op}, 'mset_progress', - $lei->{-current_url}, $nr, $nr); + mset_progress($lei, $lei->{-current_url}, $nr, $nr); next; } seek($cerr, $coff, SEEK_SET) or warn "seek(curl stderr): $!\n"; @@ -279,12 +260,15 @@ sub query_remote_mboxrd { $lei->{ovv}->ovv_atexit_child($lei); } -sub git { +# called by LeiOverview::each_smsg_cb +sub git { $_[0]->{git_tmp} // die 'BUG: caller did not set {git_tmp}' } + +sub git_tmp ($) { my ($self) = @_; my (%seen, @dirs); - my $tmp = File::Temp->newdir('lei_xsrch_git-XXXXXXXX', TMPDIR => 1); - for my $ibx (@{$self->{shard2ibx} // []}) { - my $d = File::Spec->canonpath($ibx->git->{git_dir}); + my $tmp = File::Temp->newdir("lei_xsearch_git.$$-XXXX", TMPDIR => 1); + for my $ibxish (locals($self)) { + my $d = File::Spec->canonpath($ibxish->git->{git_dir}); $seen{$d} //= push @dirs, "$d/objects\n" } my $git_dir = $tmp->dirname; @@ -298,15 +282,15 @@ sub git { $git; } -sub query_done { # EOF callback +sub query_done { # EOF callback for main daemon my ($lei) = @_; - my $has_l2m = exists $lei->{l2m}; - for my $f (qw(lxs l2m)) { - my $wq = delete $lei->{$f} or next; - $wq->wq_wait_old($lei); + my $l2m = delete $lei->{l2m}; + $l2m->wq_wait_old($lei) if $l2m; + if (my $lxs = delete $lei->{lxs}) { + $lxs->wq_wait_old($lei); } $lei->{ovv}->ovv_end($lei); - if ($has_l2m) { # close() calls LeiToMail reap_compress + if ($l2m) { # close() calls LeiToMail reap_compress if (my $out = delete $lei->{old_1}) { if (my $mbout = $lei->{1}) { close($mbout) or return $lei->fail(<<""); @@ -315,25 +299,16 @@ Error closing $lei->{ovv}->{dst}: $! } $lei->{1} = $out; } - $lei->start_mua; + $l2m->lock_free ? $l2m->poke_dst : $lei->start_mua; } - $lei->{opt}->{quiet} or + $lei->{-progress} and $lei->err('# ', $lei->{-mset_total} // 0, " matches"); $lei->dclose; } -sub mset_progress { # called via pkt_op/pkt_do from workers - my ($lei, $pargs) = @_; - my ($desc, $mset_size, $mset_total_est) = @$pargs; - return if $lei->{opt}->{quiet}; - $lei->{-mset_total} += $mset_size; - $lei->err("# $desc $mset_size/$mset_total_est"); -} - sub do_post_augment { - my ($lei, $zpipe, $au_done) = @_; - my $l2m = $lei->{l2m} or die 'BUG: no {l2m}'; - eval { $l2m->post_augment($lei, $zpipe) }; + my ($lei) = @_; + eval { $lei->{l2m}->post_augment($lei) }; if (my $err = $@) { if (my $lxs = delete $lei->{lxs}) { $lxs->wq_kill; @@ -341,11 +316,10 @@ sub do_post_augment { } $lei->fail("$err"); } - close $au_done; # triggers wait_startq + close(delete $lei->{au_done}); # triggers wait_startq } my $MAX_PER_HOST = 4; -sub MAX_PER_HOST { $MAX_PER_HOST } sub concurrency { my ($self, $opt) = @_; @@ -356,13 +330,16 @@ sub concurrency { } sub start_query { # always runs in main (lei-daemon) process - my ($self, $io, $lei) = @_; + my ($self, $lei) = @_; + if (my $l2m = $lei->{l2m}) { + $lei->start_mua if $l2m->lock_free; + } if ($lei->{opt}->{thread}) { for my $ibxish (locals($self)) { - $self->wq_do('query_thread_mset', $io, $lei, $ibxish); + $self->wq_do('query_thread_mset', [], $ibxish); } } elsif (locals($self)) { - $self->wq_do('query_mset', $io, $lei); + $self->wq_do('query_mset', []); } my $i = 0; my $q = []; @@ -370,66 +347,64 @@ sub start_query { # always runs in main (lei-daemon) process push @{$q->[$i++ % $MAX_PER_HOST]}, $uri; } for my $uris (@$q) { - $self->wq_do('query_remote_mboxrd', $io, $lei, $uris); + $self->wq_do('query_remote_mboxrd', [], $uris); } - @$io = (); +} + +sub ipc_atfork_child { + my ($self) = @_; + $self->{lei}->lei_atfork_child; + $self->SUPER::ipc_atfork_child; } sub query_prepare { # called by wq_do - my ($self, $lei) = @_; + my ($self) = @_; local $0 = "$0 query_prepare"; - $lei->atfork_child_wq($self); - delete $lei->{l2m}->{-wq_s1}; + my $lei = $self->{lei}; eval { $lei->{l2m}->do_augment($lei) }; $lei->fail($@) if $@; - pkt_do($lei->{pkt_op}, '.') == 1 or die "do_post_augment trigger: $!" -} - -sub fail_handler ($;$$) { - my ($lei, $code, $io) = @_; - if (my $lxs = delete $lei->{lxs}) { - $lxs->wq_wait_old($lei) if $lxs->wq_kill_old; # lei-daemon - } - close($io) if $io; # needed to avoid warnings on SIGPIPE - $lei->x_it($code // (1 >> 8)); -} - -sub sigpipe_handler { # handles SIGPIPE from l2m/lxs workers - fail_handler($_[0], 13, delete $_[0]->{1}); + pkt_do($lei->{pkt_op_p}, '.') == 1 or die "do_post_augment trigger: $!" } sub do_query { my ($self, $lei) = @_; + my $ops = { + '|' => [ $lei->can('sigpipe_handler'), $lei ], + '!' => [ $lei->can('fail_handler'), $lei ], + '.' => [ \&do_post_augment, $lei ], + '' => [ \&query_done, $lei ], + 'mset_progress' => [ \&mset_progress, $lei ], + 'x_it' => [ $lei->can('x_it'), $lei ], + 'child_error' => [ $lei->can('child_error'), $lei ], + }; + ($lei->{pkt_op_c}, $lei->{pkt_op_p}) = PublicInbox::PktOp->pair($ops); $lei->{1}->autoflush(1); - my ($au_done, $zpipe); + $lei->start_pager if delete $lei->{need_pager}; + $lei->{ovv}->ovv_begin($lei); my $l2m = $lei->{l2m}; if ($l2m) { - pipe($lei->{startq}, $au_done) or die "pipe: $!"; + $l2m->pre_augment($lei); + $l2m->wq_workers_start('lei2mail', $l2m->{jobs}, + $lei->oldset, { lei => $lei }); + pipe($lei->{startq}, $lei->{au_done}) or die "pipe: $!"; # 1031: F_SETPIPE_SZ fcntl($lei->{startq}, 1031, 4096) if $^O eq 'linux'; - $zpipe = $l2m->pre_augment($lei); } - my $in_loop = exists $lei->{sock}; - my $ops = { - '|' => [ \&sigpipe_handler, $lei ], - '!' => [ \&fail_handler, $lei ], - '.' => [ \&do_post_augment, $lei, $zpipe, $au_done ], - '' => [ \&query_done, $lei ], - 'mset_progress' => [ \&mset_progress, $lei ], - }; - (my $op, $lei->{pkt_op}) = PublicInbox::PktOp->pair($ops, $in_loop); - my ($lei_ipc, @io) = $lei->atfork_parent_wq($self); - delete($lei->{pkt_op}); - - $lei->event_step_init; # wait for shutdowns - if ($l2m) { - $self->wq_do('query_prepare', \@io, $lei_ipc); - $io[1] = $zpipe->[1] if $zpipe; + if (!$lei->{opt}->{thread} && locals($self)) { # for query_mset + # lei->{git_tmp} is set for wq_wait_old so we don't + # delete until all lei2mail + lei_xsearch workers are reaped + $lei->{git_tmp} = $self->{git_tmp} = git_tmp($self); } - start_query($self, \@io, $lei_ipc); - $self->wq_close(1); - unless ($in_loop) { - # for the $lei_ipc->atfork_child_wq PIPE handler: + $self->wq_workers_start('lei_xsearch', $self->{jobs}, + $lei->oldset, { lei => $lei }); + my $op = delete $lei->{pkt_op_c}; + delete $lei->{pkt_op_p}; + $l2m->wq_close(1) if $l2m; + $lei->event_step_init; # wait for shutdowns + $self->wq_do('query_prepare', []) if $l2m; + start_query($self, $lei); + $self->wq_close(1); # lei_xsearch workers stop when done + if ($lei->{oneshot}) { while ($op->{sock}) { $op->event_step } } } @@ -439,6 +414,7 @@ sub add_uri { if (my $curl = $self->{curl} //= which('curl') // 0) { require PublicInbox::MboxReader; require IO::Uncompress::Gunzip; + require PublicInbox::LeiCurl; push @{$self->{remotes}}, $uri; } else { warn "curl missing, ignoring $uri\n";