unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
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	[thread overview]
Message-ID: <20201129050935.3110-2-e@80x24.org> (raw)
In-Reply-To: <20201129050935.3110-1-e@80x24.org>

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 {

  reply	other threads:[~2020-11-29  5:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-29  5:09 [PATCH 0/2] extindex: administrative stuffs Eric Wong
2020-11-29  5:09 ` Eric Wong [this message]
2020-11-29  5:09 ` [PATCH 2/2] extindex: support `--gc' to remove dead inboxes 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=20201129050935.3110-2-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.
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).