From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH] xapcmd: delay over->check_inodes trigger
Date: Sun, 5 Jul 2020 21:51:31 +0000 [thread overview]
Message-ID: <20200705215131.22450-1-e@yhbt.net> (raw)
We must not trigger wakeups on InboxIdle users until after we've
renamed all files into place. Otherwise, the InboxIdle caller
may just reopen the old (soon-to-be-unlinked) file.
This fixes occasional test failures in t/nntpd.t
Fixes: f977826a17f8735e ("lock: reduce inotify wakeups")
---
lib/PublicInbox/Xapcmd.pm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 784140416..a57fa5597 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -23,6 +23,7 @@ sub commit_changes ($$$$) {
$SIG{INT} or die 'BUG: $SIG{INT} not handled';
my @old_shard;
+ my $over_chg;
while (my ($old, $newdir) = each %$tmp) {
next if $old eq ''; # no invalid paths
@@ -39,7 +40,7 @@ sub commit_changes ($$$$) {
my $tmp_over = "$new/over.sqlite3";
$over->connect->sqlite_backup_to_file($tmp_over);
$over = undef;
- syswrite($im->{lockfh}, '.'); # trigger ->check_inodes
+ $over_chg = 1;
}
if (!defined($new)) { # culled shard
@@ -60,6 +61,10 @@ sub commit_changes ($$$$) {
die "failed to remove $prev: $!\n";
}
}
+
+ # trigger ->check_inodes in read-only daemons
+ syswrite($im->{lockfh}, '.') if $over_chg;
+
remove_tree(@old_shard);
$tmp = undef;
if (!$opt->{-coarse_lock}) {
reply other threads:[~2020-07-05 21:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200705215131.22450-1-e@yhbt.net \
--to=e@yhbt.net \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).