diff options
author | Eric Wong <e@80x24.org> | 2020-09-02 11:04:21 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-09-03 20:11:03 +0000 |
commit | 3bf9e1e4d8e5a84a0d8c733faf49555aa84379aa (patch) | |
tree | 2dbb5afc9c71cc7ab6c306472161f7e8f08806c0 | |
parent | 12d219222ac5bc09cf364f15834c1e5cc5659e8f (diff) | |
download | public-inbox-3bf9e1e4d8e5a84a0d8c733faf49555aa84379aa.tar.gz |
We'll also fix the read-only code to ensure we notice missing Xapian shards, since gaps would throw off our expectation that Xapian document IDs and NNTP article numbers are interchangeable.
-rw-r--r-- | lib/PublicInbox/Search.pm | 5 | ||||
-rw-r--r-- | lib/PublicInbox/V2Writable.pm | 23 |
2 files changed, 7 insertions, 21 deletions
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index b07f4ea6..fb35b747 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -7,6 +7,7 @@ package PublicInbox::Search; use strict; use parent qw(Exporter); our @EXPORT_OK = qw(mdocid); +use List::Util qw(max); # values for searching, changing the numeric value breaks # compatibility with old indices (so don't change them it) @@ -203,7 +204,9 @@ sub _xdb ($) { # We need numeric sorting so shard[0] is first for reading # Xapian metadata, if needed - for (sort { $a <=> $b } grep(/\A[0-9]+\z/, readdir($dh))) { + my $last = max(grep(/\A[0-9]+\z/, readdir($dh))); + return if !defined($last); + for (0..$last) { my $shard_dir = "$dir/$_"; if (-d $shard_dir && -r _) { push @xdb, $X{Database}->new($shard_dir); diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index c8334645..a1f6048f 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -65,28 +65,11 @@ sub nproc_shards ($) { sub count_shards ($) { my ($self) = @_; - my $n = 0; - my $xpfx = $self->{xpfx}; - # always load existing shards in case core count changes: # Also, shard count may change while -watch is running - # due to "xcpdb --reshard" - if (-d $xpfx) { - my $XapianDatabase; - foreach my $shard (<$xpfx/*>) { - -d $shard && $shard =~ m!/[0-9]+\z! or next; - $XapianDatabase //= do { - require PublicInbox::Search; - PublicInbox::Search::load_xapian(); - $PublicInbox::Search::X{Database}; - }; - eval { - $XapianDatabase->new($shard)->close; - $n++; - }; - } - } - $n; + my $srch = $self->{ibx}->search or return 0; + delete $self->{ibx}->{search}; + $srch->{nshard} // 0 } sub new { |