From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/4] v2 + lei/store: always wait for fast-import checkpoint
Date: Tue, 16 Apr 2024 20:56:26 +0000 [thread overview]
Message-ID: <20240416205629.3648894-2-e@80x24.org> (raw)
In-Reply-To: <20240416205629.3648894-1-e@80x24.org>
Since data going to git is the most important, always ensure
data is written to git before attempting to write anything to
SQLite or Xapian.
---
lib/PublicInbox/LeiStore.pm | 4 +---
lib/PublicInbox/V2Writable.pm | 8 +-------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 2eb09eca..0df2352c 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -573,9 +573,7 @@ sub set_xvmd {
sub checkpoint {
my ($self, $wait) = @_;
- if (my $im = $self->{im}) {
- $wait ? $im->barrier : $im->checkpoint;
- }
+ $self->{im}->barrier if $self->{im};
delete $self->{lms};
$self->{priv_eidx}->checkpoint($wait);
}
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index fb259396..43f37f60 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -507,13 +507,7 @@ sub set_last_commits ($) { # this is NOT for ExtSearchIdx
sub checkpoint ($;$) {
my ($self, $wait) = @_;
- if (my $im = $self->{im}) {
- if ($wait) {
- $im->barrier;
- } else {
- $im->checkpoint;
- }
- }
+ $self->{im}->barrier if $self->{im};
my $shards = $self->{idx_shards};
if ($shards) {
my $dbh = $self->{mm}->{dbh} if $self->{mm};
next prev parent reply other threads:[~2024-04-16 20:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 20:56 [PATCH 0/4] lei parallelism fixes Eric Wong
2024-04-16 20:56 ` Eric Wong [this message]
2024-04-16 20:56 ` [PATCH 2/4] lei: use ->barrier to commit to lei/store Eric Wong
2024-04-16 20:56 ` [PATCH 3/4] lei/store: stop shard workers + cat-file on idle Eric Wong
2024-04-17 9:34 ` [PATCH v2 " Eric Wong
2024-04-17 9:54 ` sub prototypes aren't enough Eric Wong
2024-04-16 20:56 ` [PATCH 4/4] lei: use async barrier for --import-before 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=20240416205629.3648894-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).