diff options
| author | Eric Wong <e@80x24.org> | 2021-09-06 07:20:12 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-09-06 11:05:41 +0000 |
| commit | fc9fa8f2feb2a647683f6a219fca72e88e3a9516 (patch) | |
| tree | c1e50e96085f2616bd5fb07624106a6d2c13668a /lib/PublicInbox/LeiSearch.pm | |
| parent | ef507953617741565d18c86b87973469206d5632 (diff) | |
| download | public-inbox-fc9fa8f2feb2a647683f6a219fca72e88e3a9516.tar.gz | |
The deeper eval was preventing retry_reopen from retrying
with readers and writers working in parallel:
FOO=imaps://example.com/INBOX.huge
lei lcat $FOO -f mboxcl | lei tag -F mboxcl +L:bar -
Fixes: c7bcfe6cd6648ff0 ("lei: diagnostics for /Document \d+ not found/ errors")
Diffstat (limited to 'lib/PublicInbox/LeiSearch.pm')
| -rw-r--r-- | lib/PublicInbox/LeiSearch.pm | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm index 47160ed9..a10e6e17 100644 --- a/lib/PublicInbox/LeiSearch.pm +++ b/lib/PublicInbox/LeiSearch.pm @@ -55,17 +55,13 @@ sub _xsmsg_vmd { # retry_reopen $kw{flagged} = 1 if delete($smsg->{lei_q_tt_flagged}); my @num = $self->over->blob_exists($smsg->{blob}); for my $num (@num) { # there should only be one... - eval { - $doc = $xdb->get_document(num2docid($self, $num)); - $x = xap_terms('K', $doc); - %kw = (%kw, %$x); - if ($want_label) { # JSON/JMAP only - $x = xap_terms('L', $doc); - %L = (%L, %$x); - } - }; - warn "$$ $0 #$num (nshard=$self->{nshard}) $smsg->{blob}: $@" - if $@; + $doc = $xdb->get_document(num2docid($self, $num)); + $x = xap_terms('K', $doc); + %kw = (%kw, %$x); + if ($want_label) { # JSON/JMAP only + $x = xap_terms('L', $doc); + %L = (%L, %$x); + } } $smsg->{kw} = [ sort keys %kw ] if scalar(keys(%kw)); $smsg->{L} = [ sort keys %L ] if scalar(keys(%L)); @@ -75,7 +71,8 @@ sub _xsmsg_vmd { # retry_reopen sub xsmsg_vmd { my ($self, $smsg, $want_label) = @_; return if $smsg->{kw}; # already set by LeiXSearch->mitem_kw - $self->retry_reopen(\&_xsmsg_vmd, $smsg, $want_label); + eval { $self->retry_reopen(\&_xsmsg_vmd, $smsg, $want_label) }; + warn "$$ $0 (nshard=$self->{nshard}) $smsg->{blob}: $@" if $@; } # when a message has no Message-IDs at all, this is needed for |