lei: avoid deadlock on inotify/EVFILT_VNODE wakeups

[public-inbox.git] / lib / PublicInbox / LeiNoteEvent.pm

diff --git a/lib/PublicInbox/LeiNoteEvent.pm b/lib/PublicInbox/LeiNoteEvent.pm
index 22d6ffac9feb7e4cfabbb96d88542a58fc61ae30..93f80116caa69993f29af63365255dc38aeb77d8 100644 (file)
--- a/lib/PublicInbox/LeiNoteEvent.pm
+++ b/lib/PublicInbox/LeiNoteEvent.pm
@@ -58,7 +58,7 @@ sub eml_event ($$$$) {
        }
 }
 
-sub maildir_event { # via wq_io_do
+sub maildir_event { # via wq_nonblock_do
        my ($self, $fn, $vmd, $state) = @_;
        if (my $eml = PublicInbox::InboxWritable::eml_from_path($fn)) {
                eml_event($self, $eml, $vmd, $state);
@@ -93,6 +93,7 @@ sub lei_note_event {
                my ($op_c, $ops) = $lei->workers_start($wq, $jobs);
                $lei->wait_wq_events($op_c, $ops);
                note_event_arm_done($lei);
+               $wq->prepare_nonblock;
                $lei->{lne} = $wq;
        };
        if ($folder =~ /\Amaildir:/i) {
@@ -101,7 +102,7 @@ sub lei_note_event {
                return if index($fl, 'T') >= 0;
                my $kw = PublicInbox::MdirReader::flags2kw($fl);
                my $vmd = { kw => $kw, sync_info => [ $folder, \$bn ] };
-               $self->wq_do('maildir_event', $fn, $vmd, $state);
+               $self->wq_nonblock_do('maildir_event', $fn, $vmd, $state);
        } # else: TODO: imap
 }
 
@@ -114,9 +115,7 @@ sub ipc_atfork_child {
 }
 
 sub _lei_wq_eof { # EOF callback for main lei daemon
-       my ($lei) = @_;
-       my $lne = delete $lei->{lne} or return $lei->fail;
-       $lei->sto_done_request($lne->{lei_sock});
+       $_[0]->wq_eof('lne');
 }
 
 1;