From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 9FCF41F560 for ; Wed, 4 Oct 2023 03:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1696391373; bh=EMkQufAEYNgOjQlq7UbSR6obZW1La/x7HwG81Gc/+k0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=E9D4ujwjHfmcSqpU2Uox2efw7XxeIr7Er1kgpMU0+913prbfKClwEiBqfU+/laOCL Mt2OQdTeqTrvu71cm/QRlXNzleLINKaNBNyg8b+hmvyQhy/WCxNR5ZHlX4fDNLHMJe /G09uCkgsWLF+aFBronm+SzM5mQXGoBvuF2kvNsY= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 01/21] lei: drop stores explicitly at daemon shutdown Date: Wed, 4 Oct 2023 03:49:13 +0000 Message-ID: <20231004034933.3343930-2-e@80x24.org> In-Reply-To: <20231004034933.3343930-1-e@80x24.org> References: <20231004034933.3343930-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This will allow us to avoid unblocking signals during shutdown to simplify our code. --- lib/PublicInbox/DS.pm | 3 +-- lib/PublicInbox/LEI.pm | 13 ++++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index 142122a8..c476311b 100644 --- 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 10c08b90..368eee26 100644 --- 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