user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/4] extindex: retry sync_inbox before reindex
Date: Sat, 16 Oct 2021 22:52:48 -1100	[thread overview]
Message-ID: <20211017095250.22252-3-e@80x24.org> (raw)
In-Reply-To: <20211017095250.22252-1-e@80x24.org>

Ensure the num highwater mark of the target inbox is stable
before using it.  Otherwise we may end up repeating work
done to index a message.
---
 lib/PublicInbox/ExtSearchIdx.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm
index 67d720368922..daff656d1ac5 100644
--- a/lib/PublicInbox/ExtSearchIdx.pm
+++ b/lib/PublicInbox/ExtSearchIdx.pm
@@ -859,14 +859,20 @@ sub _reindex_check_ibx ($$$) {
 	my $slice = 10000;
 	my $opt = { limit => $slice };
 	my ($beg, $end) = (1, $slice);
-	my $err = sync_inbox($self, $sync, $ibx) and return;
-	my $max = $ibx->mm->num_highwater;
+	my $ekey = $ibx->eidx_key;
+	my ($max, $max0);
+	do {
+		$max0 = $ibx->mm->num_highwater;
+		sync_inbox($self, $sync, $ibx) and return; # warned
+		$max = $ibx->mm->num_highwater;
+		return if $sync->{quit};
+	} while ($max > $max0 &&
+		warn("# $ekey moved $max0..$max, resyncing..\n"));
 	$end = $max if $end > $max;
 
 	# first, check if we missed any messages in target $ibx
 	my $msgs;
 	my $pr = $sync->{-opt}->{-progress};
-	my $ekey = $ibx->eidx_key;
 	local $sync->{-regen_fmt} = "$ekey checking %u/$max\n";
 	${$sync->{nr}} = 0;
 	my $fast = $sync->{-opt}->{fast};

  parent reply	other threads:[~2021-10-17  9:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-17  9:52 [PATCH 0/4] extindex tweaks and small fixes Eric Wong
2021-10-17  9:52 ` [PATCH 1/4] extindex: use localtime to display lock time Eric Wong
2021-10-17  9:52 ` Eric Wong [this message]
2021-10-17  9:52 ` [PATCH 3/4] extindex: guard against false mismatch unrefs Eric Wong
2021-10-17  9:52 ` [PATCH 4/4] extindex: better locations for {quit} checks 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=20211017095250.22252-3-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.
Code repositories for project(s) associated with this 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).