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 D5F781FA19 for ; Tue, 15 Dec 2020 02:02:25 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 6/9] extsearchidx: checkpoint releases locks Date: Tue, 15 Dec 2020 02:02:21 +0000 Message-Id: <20201215020224.11739-7-e@80x24.org> In-Reply-To: <20201215020224.11739-1-e@80x24.org> References: <20201215020224.11739-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: --reindex can take many hours or days, ensure we release locks according to --batch-size so automated fetch+index jobs can write new data to indices while we update old data. --- lib/PublicInbox/ExtSearchIdx.pm | 19 ++++++------------- lib/PublicInbox/V2Writable.pm | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm index f29a84e3..3b021a1b 100644 --- a/lib/PublicInbox/ExtSearchIdx.pm +++ b/lib/PublicInbox/ExtSearchIdx.pm @@ -404,7 +404,7 @@ sub _reindex_finalize ($$$) { my $orig_smsg = $req->{orig_smsg} // die 'BUG: no {orig_smsg}'; my $docid = $smsg->{num} = $orig_smsg->{num}; $self->{oidx}->add_overview($eml, $smsg); # may rethread - $self->{transact_bytes} += $smsg->{bytes}; + check_batch_limit({ %$sync, new_smsg => $smsg }); if ($nr == 1) { # likely, all good $self->idx_shard($docid)->shard_reindex_docid($docid); return; @@ -537,18 +537,8 @@ sub eidxq_process ($$) { # for reindexing warn "E: #$docid does not exist in over\n"; } $del->execute($docid); + ++${$sync->{nr}}; - my $cur = ++${$sync->{nr}}; - - # shards flush on their own, just don't queue up too many - # deletes - if ($self->{transact_bytes} >= $self->{batch_bytes}) { - $self->git->async_wait_all; - $self->{oidx}->commit_lazy; - $self->{oidx}->begin_lazy; - $pr->("reindexed $cur/$tot\n") if $pr; - $self->{transact_bytes} = 0; - } # this is only for SIGUSR1, shards do their own accounting: reindex_checkpoint($self, $sync) if ${$sync->{need_checkpoint}}; } @@ -709,7 +699,10 @@ sub eidx_sync { # main entry point for my $ibx (@{$self->{ibx_list}}) { $ibx->{-ibx_id} //= $self->{oidx}->ibx_id($ibx->eidx_key); } - eidx_reindex($self, $sync) if delete($opt->{reindex}); + if (delete($opt->{reindex})) { + $sync->{checkpoint_unlocks} = 1; + eidx_reindex($self, $sync); + } # don't use $_ here, it'll get clobbered by reindex_checkpoint for my $ibx (@{$self->{ibx_list}}) { diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 572eb418..97dbf328 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -884,7 +884,7 @@ sub reindex_checkpoint ($$) { my $mm_tmp = $sync->{mm_tmp}; $mm_tmp->atfork_prepare if $mm_tmp; die 'BUG: {im} during reindex' if $self->{im}; - if ($self->{ibx_map}) { + if ($self->{ibx_map} && !$sync->{checkpoint_unlocks}) { checkpoint($self, 1); # no need to release lock on pure index } else { $self->done; # release lock