lei: drop stores explicitly at daemon shutdown

This will allow us to avoid unblocking signals during
shutdown to simplify our code.

diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 142122a8652bde295b7eeae0d82e05419e553a09..c476311b9e1a92a89cf5f94ddeeb74b35c9450f0 100644 (file)
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -38,10 +38,9 @@ our @EXPORT_OK = qw(now msg_more awaitpid add_timer add_uniq_timer);
 
 my %Stack;
 my $nextq; # queue for next_tick
-my $AWAIT_PIDS; # pid => [ $callback, @args ]
 my $reap_armed;
 my $ToClose; # sockets to close when event loop is done
-our (
+our ($AWAIT_PIDS, # pid => [ $callback, @args ]
      %DescriptorMap,             # fd (num) -> PublicInbox::DS object
      $Poller, # global Select, Epoll, DSPoll, or DSKQXS ref
 

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 10c08b905f1a92bb010251bc16946cb22fde9069..368eee2665755143d23e59e6689589565f8f9acb 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1271,6 +1271,15 @@ sub dir_idle_handler ($) { # PublicInbox::DirIdle callback
        }
 }
 
+sub drop_all_stores () {
+       for my $cfg (values %PATH2CFG) {
+               my $sto = delete($cfg->{-lei_store}) // next;
+               eval { $sto->wq_io_do('done') };
+               warn "E: $@ (dropping store for $cfg->{-f})" if $@;
+               $sto->wq_close;
+       }
+}
+
 # lei(1) calls this when it can't connect
 sub lazy_start {
        my ($path, $errno, $narg) = @_;
@@ -1367,7 +1376,9 @@ sub lazy_start {
                                $s->close;
                        }
                }
-               $n; # true: continue, false: stop
+               drop_all_stores() if !$n; # drop stores only if no clients
+               # returns true: continue, false: stop
+               $n + scalar(keys(%$PublicInbox::DS::AWAIT_PIDS));
        });
 
        # STDIN was redirected to /dev/null above, closing STDERR and