From: Eric Wong (Contractor, The Linux Foundation) <e@80x24.org>
Date: Fri, 30 Mar 2018 01:20:40 +0000 (+0000)
Subject: search: warn on reopens and die on total failure
X-Git-Tag: v1.1.0-pre1~96
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=62fc4208337b5ea07240bfaa3a8ee5d670b75f72;p=public-inbox.git

search: warn on reopens and die on total failure

-watch on a busy/giant Maildir caused too many Xapian
errors while attempting to browse.
---

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 5fc7682c..de296e1a 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -215,18 +215,20 @@ sub get_thread {
 sub retry_reopen {
 	my ($self, $cb) = @_;
 	my $ret;
-	for (1..10) {
+	for my $i (1..10) {
 		eval { $ret = $cb->() };
 		return $ret unless $@;
 		# Exception: The revision being read has been discarded -
 		# you should call Xapian::Database::reopen()
 		if (ref($@) eq 'Search::Xapian::DatabaseModifiedError') {
+			warn "reopen try #$i on $@\n";
 			reopen($self);
 		} else {
 			warn "ref: ", ref($@), "\n";
 			die;
 		}
 	}
+	die "Too many Xapian database modifications in progress\n";
 }
 
 sub _do_enquire {