From dea4495677bbbdbce959551de34ef8f70fe2bc7c Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sun, 10 Oct 2021 14:25:18 +0000
Subject: extindex: sync each inbox before checking for missed messages

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(+)

(limited to 'lib/PublicInbox/ExtSearchIdx.pm')

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
-- 
cgit v1.2.3-24-ge0c7