]> Sergey Matveev's repositories - public-inbox.git/commitdiff
lei_saved_search: avoid reentrancy in ->is_dup
authorEric Wong <e@80x24.org>
Sat, 24 Apr 2021 22:42:59 +0000 (22:42 +0000)
committerEric Wong <e@80x24.org>
Sat, 24 Apr 2021 23:00:41 +0000 (19:00 -0400)
Use a separate git process when calling xoids_for to prevent
reentrancy in ->is_dup.  Reentrancy happens since LeiToMail will
call ->is_dup when inside callbacks when writing mail.

This fixes --dedupe=mid test failures in t/lei-q-save.t

I could only reproduce this consistently on a uniprocessor VM.
"schedtool -a 0x1 -e ..." could not reproduce the problem on
2 and 4-core systems.

lib/PublicInbox/LeiSavedSearch.pm

index af864a50aadeb319dd08b4a548642b05337e87a0..682a43e8c4f1dd98709220b5ebd81dca95c8fd91 100644 (file)
@@ -6,6 +6,7 @@ package PublicInbox::LeiSavedSearch;
 use strict;
 use v5.10.1;
 use parent qw(PublicInbox::Lock);
+use PublicInbox::Git;
 use PublicInbox::OverIdx;
 use PublicInbox::LeiSearch;
 use PublicInbox::Config;
@@ -224,11 +225,13 @@ sub prepare_dedupe {
 
 sub over { $_[0]->{oidx} } # for xoids_for
 
-sub git { $_[0]->{ale}->git }
+# don't use ale->git directly since is_dup is called inside
+# ale->git->cat_async callbacks
+sub git { $_[0]->{git} //= PublicInbox::Git->new($_[0]->{ale}->git->{git_dir}) }
 
 sub pause_dedupe {
        my ($self) = @_;
-       $self->{ale}->git->cleanup;
+       git($self)->cleanup;
        my $lockfh = delete $self->{lockfh}; # from lock_for_scope_fast;
        my $oidx = delete($self->{oidx}) // return;
        $oidx->commit_lazy;