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-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 617621FA17 for ; Sun, 29 Nov 2020 05:09:35 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] v2writable: detect shard count for ExtSearchIdx properly Date: Sun, 29 Nov 2020 05:09:34 +0000 Message-Id: <20201129050935.3110-2-e@80x24.org> In-Reply-To: <20201129050935.3110-1-e@80x24.org> References: <20201129050935.3110-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Otherwise, any explicitly set shard counts were ignored and we'd be counting CPUs every single time. --- lib/PublicInbox/V2Writable.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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 {