From: Eric Wong <e@80x24.org>
Date: Sun, 29 Nov 2020 05:09:34 +0000 (+0000)
Subject: v2writable: detect shard count for ExtSearchIdx properly
X-Git-Tag: v1.7.0~1593
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=33f80a367325f3dac983633cb0a59946205776c2;p=public-inbox.git

v2writable: detect shard count for ExtSearchIdx properly

Otherwise, any explicitly set shard counts were ignored and
we'd be counting CPUs every single time.
---

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index a3938b56..e9a43000 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -65,13 +65,21 @@ sub nproc_shards ($) {
 
 sub count_shards ($) {
 	my ($self) = @_;
-	$self->{ibx} ? do {
+	if (my $ibx = $self->{ibx}) {
 		# always load existing shards in case core count changes:
 		# Also, shard count may change while -watch is running
-		my $srch = $self->{ibx}->search or return 0;
-		delete $self->{ibx}->{search};
+		my $srch = $ibx->search or return 0;
+		delete $ibx->{search};
 		$srch->{nshard} // 0
-	} : $self->{nshard}; # self->{nshard} is for ExtSearchIdx
+	} else { # ExtSearchIdx
+		$self->{nshard} // do {
+			if ($self->xdb_sharded) {
+				$self->{nshard} // die 'BUG: {nshard} unset';
+			} else {
+				0;
+			}
+		}
+	}
 }
 
 sub new {