From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 2FC171FB05 for ; Sun, 10 Oct 2021 14:25:20 +0000 (UTC) From: Eric Wong 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 Message-Id: <20211010142518.7012-9-e@80x24.org> In-Reply-To: <20211010142518.7012-1-e@80x24.org> References: <20211010142518.7012-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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