about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-05-17 00:08:54 +0000
committerEric Wong <e@yhbt.net>2020-05-17 19:08:42 +0000
commitf3482d4a19a8de47199fa18beb258deb699bf703 (patch)
treeeb12fb207eefa3beb9fa70465262b78b249b92d7
parent9787fae1f7235bd790d1db6f0b513ce420c361bd (diff)
downloadpublic-inbox-f3482d4a19a8de47199fa18beb258deb699bf703.tar.gz
`--reindex' involves chomping down lots of mail, so it benefits
from parallelization just like the initial indexing.  It's
also a bit surprising to specify `--jobs/-j' without parallel
processes, so ensure we turn on parallelization there, too.

We can simplify initialization here, as well, since neither
`eval' nor `V2Writable->new' should be in this code.
-rw-r--r--lib/PublicInbox/Admin.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 2c8d191a..e42b01e0 100644
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -191,9 +191,8 @@ sub index_inbox {
         if (ref($ibx) && $ibx->version == 2) {
                 eval { require PublicInbox::V2Writable };
                 die "v2 requirements not met: $@\n" if $@;
-                my $v2w = $im // eval { $ibx->importer(0) } || eval {
-                        PublicInbox::V2Writable->new($ibx, {nproc=>$jobs});
-                };
+                $ibx->{-creat_opt}->{nproc} = $jobs;
+                my $v2w = $im // $ibx->importer($opt->{reindex} // $jobs);
                 if (defined $jobs) {
                         if ($jobs == 0) {
                                 $v2w->{parallel} = 0;