From 79d2267323dc67d70bf4798157dcc2bf822c313d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 16 Aug 2022 03:44:03 +0000 Subject: lei: do not wait for sto->done on disconnected EOF lei-daemon (the top-level daemon process) should not have synchronous waits, and this was causing a deadlock with interrupted commands. There may still be a bug lurking in lei/store despite this fix, though. I originally thought commit fd261b9e65674505 (lei_store_err: use level-trigger for error pipe, 2022-08-15) was sufficient, but at least this change is needed, as well. --- lib/PublicInbox/LEI.pm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lib/PublicInbox') diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index d81ca296..595b3fa9 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -1520,13 +1520,10 @@ sub sto_done_request { return unless $lei->{sto}; local $current_lei = $lei; my $sock = $wq ? $wq->{lei_sock} : undef; - eval { - if ($sock //= $lei->{sock}) { # issue, async wait - $lei->{sto}->wq_io_do('done', [ $sock ]); - } else { # forcibly wait - my $wait = $lei->{sto}->wq_do('done'); - } - }; + $sock //= $lei->{sock}; + my @io; + push(@io, $sock) if $sock; # async wait iff possible + eval { $lei->{sto}->wq_io_do('done', \@io) }; warn($@) if $@; } -- cgit v1.2.3-24-ge0c7