From: Eric Wong <e@80x24.org>
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 [thread overview]
Message-ID: <20231004034933.3343930-2-e@80x24.org> (raw)
In-Reply-To: <20231004034933.3343930-1-e@80x24.org>
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
next prev parent reply other threads:[~2023-10-04 3:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 3:49 [PATCH 00/21] lei + IPC related stuff Eric Wong
2023-10-04 3:49 ` Eric Wong [this message]
2023-10-04 3:49 ` [PATCH 02/21] ds: hoist out close_non_busy Eric Wong
2023-10-04 3:49 ` [PATCH 03/21] ds: don't pass FD map to post_loop_do callback Eric Wong
2023-10-04 3:49 ` [PATCH 04/21] move all non-test @post_loop_do into named subs Eric Wong
2023-10-04 3:49 ` [PATCH 05/21] lei: close DirIdle (inotify) early at daemon shutdown Eric Wong
2023-10-04 3:49 ` [PATCH 06/21] input_pipe: {args} is never undefined Eric Wong
2023-10-04 3:49 ` [PATCH 07/21] lei: do_env combines fchdir and local Eric Wong
2023-10-04 3:49 ` [PATCH 08/21] lei: get rid of l2m_progress PktOp callback Eric Wong
2023-10-04 3:49 ` [PATCH 09/21] t/lei_to_mail: modernize and document test Eric Wong
2023-10-04 3:49 ` [PATCH 10/21] lei: reuse PublicInbox::Config::noop Eric Wong
2023-10-04 3:49 ` [PATCH 11/21] lei: keep signals blocked on daemon shutdown Eric Wong
2023-10-04 3:49 ` [PATCH 12/21] mbox_lock: retry on EINTR and use autodie Eric Wong
2023-10-04 3:49 ` [PATCH 13/21] lock: retry on EINTR, improve error reporting Eric Wong
2023-10-04 3:49 ` [PATCH 14/21] treewide: use PublicInbox::Lock->new Eric Wong
2023-10-04 3:49 ` [PATCH 15/21] gcf2: use PublicInbox::Lock Eric Wong
2023-10-04 3:49 ` [PATCH 16/21] spawn: use autodie and PublicInbox::Lock Eric Wong
2023-10-04 3:49 ` [PATCH 17/21] xap_helper: retry flock on EINTR Eric Wong
2023-10-04 3:49 ` [PATCH 18/21] xap_helper.pm: use EINTR-aware recv_cmd Eric Wong
2023-10-04 3:49 ` [PATCH 19/21] spawn: drop checks for directory writability Eric Wong
2023-10-04 3:49 ` [PATCH 20/21] lei: document and local-ize $OPT hashref Eric Wong
2023-10-04 3:49 ` [PATCH 21/21] searchidx: fix redundant `in' in warning message Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231004034933.3343930-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).