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 6609C1F5AE for ; Sun, 26 Jul 2020 09:31:10 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] index: --compact respects --jobs. Date: Sun, 26 Jul 2020 09:31:10 +0000 Message-Id: <20200726093110.22773-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: And -compact supports --jobs=0 like -index to disable parallel execution. Running three xapian-compact processes in parallel on a USB 2.0 HDD is pretty painful. --- lib/PublicInbox/Xapcmd.pm | 2 +- script/public-inbox-index | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm index d6c069d75..3b7a581bd 100644 --- a/lib/PublicInbox/Xapcmd.pm +++ b/lib/PublicInbox/Xapcmd.pm @@ -129,7 +129,7 @@ sub same_fs_or_die ($$) { sub process_queue { my ($queue, $cb, $opt) = @_; - my $max = $opt->{jobs} || scalar(@$queue); + my $max = $opt->{jobs} // scalar(@$queue); if ($max <= 1) { while (defined(my $args = shift @$queue)) { $cb->($args, $opt); diff --git a/script/public-inbox-index b/script/public-inbox-index index d5c7cae2b..5a0ceab78 100755 --- a/script/public-inbox-index +++ b/script/public-inbox-index @@ -24,6 +24,9 @@ if ($opt->{compact}) { require PublicInbox::Xapcmd; PublicInbox::Xapcmd::check_compact(); $compact_opt = { -coarse_lock => 1, compact => 1 }; + if (defined(my $jobs = $opt->{jobs})) { + $compact_opt->{jobs} = $jobs; + } } my $cfg = PublicInbox::Config->new;