unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 8/8] extindex: sync each inbox before checking for missed messages
Date: Sun, 10 Oct 2021 14:25:18 +0000	[thread overview]
Message-ID: <20211010142518.7012-9-e@80x24.org> (raw)
In-Reply-To: <20211010142518.7012-1-e@80x24.org>

Otherwise, it gets too noisy and we repeat some work
when we do an actual sync, since the last_commit info
will be out-of-date.
---
 lib/PublicInbox/ExtSearchIdx.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm
index acf35e3d..d589d2c0 100644
--- a/lib/PublicInbox/ExtSearchIdx.pm
+++ b/lib/PublicInbox/ExtSearchIdx.pm
@@ -812,6 +812,9 @@ sub _reindex_check_unseen ($$$) {
 	my $ibx_id = $ibx->{-ibx_id};
 	my $slice = 1000;
 	my ($beg, $end) = (1, $slice);
+	my $err = sync_inbox($self, $sync, $ibx) and return;
+	my $max = $ibx->over->max;
+	$end = $max if $end > $max;
 
 	# first, check if we missed any messages in target $ibx
 	my $msgs;
@@ -825,6 +828,7 @@ sub _reindex_check_unseen ($$$) {
 		${$sync->{nr}} = $beg;
 		$beg = $msgs->[-1]->{num} + 1;
 		$end = $beg + $slice;
+		$end = $max if $end > $max;
 		if (checkpoint_due($sync)) {
 			reindex_checkpoint($self, $sync); # release lock
 		}
@@ -952,6 +956,7 @@ sub sync_inbox {
 	my $err = _sync_inbox($self, $sync, $ibx);
 	delete @$ibx{qw(mm over)};
 	warn $err, "\n" if defined($err);
+	$err;
 }
 
 sub dd_smsg { # git->cat_async callback

      parent reply	other threads:[~2021-10-10 14:25 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-10 14:25 [PATCH 0/8] extindex and then some Eric Wong
2021-10-10 14:25 ` [PATCH 1/8] lei_to_mail: show --output on augment progress failure Eric Wong
2021-10-10 14:25 ` [PATCH 2/8] admin: add '# ' prefix for progress messages Eric Wong
2021-10-10 14:25 ` [PATCH 3/8] set nodatacow on more SQLite files Eric Wong
2021-10-10 14:25 ` [PATCH 4/8] extindex: speed up Xapian cleanup in --gc Eric Wong
2021-10-10 14:25 ` [PATCH 5/8] extindex: minor cost reductions Eric Wong
2021-10-10 14:25 ` [PATCH 6/8] extindex: --gc doesn't touch ghost entries Eric Wong
2021-10-10 14:25 ` [PATCH 7/8] lei/store: keep ".err-XXXX" in stderr tmpfile Eric Wong
2021-10-10 14:25 ` Eric Wong [this message]

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=20211010142518.7012-9-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).