X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-convert;h=c9075207ea4a21e86435b87e95ca5e208e591c6f;hb=3c90d6a62533f87bc865f02fb6df78577c4f0b89;hp=7fb15adf69bc2e9db9b3fbf944b45052f7cfd94e;hpb=7bca96023bb26438a5c9d0a7eec3986f5d66f5bf;p=public-inbox.git diff --git a/script/public-inbox-convert b/script/public-inbox-convert index 7fb15adf..c9075207 100755 --- a/script/public-inbox-convert +++ b/script/public-inbox-convert @@ -2,62 +2,95 @@ # Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ use strict; -use warnings; +use v5.10.1; use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev); -use PublicInbox::InboxWritable; -use PublicInbox::Config; -use PublicInbox::Admin; -use PublicInbox::V2Writable; -use PublicInbox::Git; -use PublicInbox::Spawn qw(spawn); -use Cwd 'abs_path'; -use File::Copy 'cp'; # preserves permissions: -my $usage = "Usage: public-inbox-convert OLD NEW\n"; -my $jobs; -my $index = 1; -my %opts = ( - '--jobs|j=i' => \$jobs, - '--index!' => \$index, -); -GetOptions(%opts) or die "bad command-line args\n$usage"; +my $usage = 'Usage: public-inbox-convert [options] OLD NEW'; +my $help = < 1, + # index defaults: + quiet => -1, compact => 0, maxsize => undef, fsync => 1, + reindex => 1, # we always reindex +}; +GetOptions($opt, qw(jobs|j=i index! help|?), + # index options + qw(verbose|v+ rethread compact|c+ fsync|sync! + indexlevel|index-level|L=s max_size|max-size=s + batch_size|batch-size=s + sequential_shard|sequential-shard|seq-shard + )) or die <{help}) { print $help; exit 0 }; my $old_dir = shift(@ARGV) or die $usage; my $new_dir = shift(@ARGV) or die $usage; die "$new_dir exists\n" if -d $new_dir; die "$old_dir not a directory\n" unless -d $old_dir; -my $config = PublicInbox::Config->new; + +require Cwd; +Cwd->import('abs_path'); +require PublicInbox::Config; +require PublicInbox::InboxWritable; + $old_dir = abs_path($old_dir); +my $cfg = PublicInbox::Config->new; my $old; -if ($config) { - $config->each_inbox(sub { - $old = $_[0] if abs_path($_[0]->{inboxdir}) eq $old_dir; - }); -} -unless ($old) { +$cfg->each_inbox(sub { + $old = $_[0] if abs_path($_[0]->{inboxdir}) eq $old_dir; +}); +if ($old) { + $old = PublicInbox::InboxWritable->new($old); +} else { warn "W: $old_dir not configured in " . PublicInbox::Config::default_file() . "\n"; - $old = { + $old = PublicInbox::InboxWritable->new({ inboxdir => $old_dir, name => 'ignored', + -primary_address => 'old@example.com', address => [ 'old@example.com' ], - }; - $old = PublicInbox::Inbox->new($old); -} -$old = PublicInbox::InboxWritable->new($old); -if ($old->version >= 2) { - die "Only conversion from v1 inboxes is supported\n"; + }); } +die "Only conversion from v1 inboxes is supported\n" if $old->version >= 2; +require PublicInbox::Admin; $old->{indexlevel} //= PublicInbox::Admin::detect_indexlevel($old); -if ($index) { +my $env; +if ($opt->{'index'}) { my $mods = {}; PublicInbox::Admin::scan_ibx_modules($mods, $old); PublicInbox::Admin::require_or_die(keys %$mods); + PublicInbox::Admin::progress_prepare($opt); + $env = PublicInbox::Admin::index_prepare($opt, $cfg); } - +local %ENV = (%$env, %ENV) if $env; my $new = { %$old }; $new->{inboxdir} = abs_path($new_dir); $new->{version} = 2; -$new = PublicInbox::InboxWritable->new($new); +$new = PublicInbox::InboxWritable->new($new, { nproc => $opt->{jobs} }); +$new->{-no_fsync} = 1 if !$opt->{fsync}; my $v2w; $old->umask_prepare; @@ -65,15 +98,16 @@ sub link_or_copy ($$) { my ($src, $dst) = @_; link($src, $dst) and return; $!{EXDEV} or warn "link $src, $dst failed: $!, trying cp\n"; - cp($src, $dst) or die "cp $src, $dst failed: $!\n"; + require File::Copy; # preserves permissions: + File::Copy::cp($src, $dst) or die "cp $src, $dst failed: $!\n"; } $old->with_umask(sub { my $old_cfg = "$old->{inboxdir}/config"; local $ENV{GIT_CONFIG} = $old_cfg; my $new_cfg = "$new->{inboxdir}/all.git/config"; - $v2w = PublicInbox::V2Writable->new($new, 1); - $v2w->init_inbox($jobs); + $v2w = $new->importer(1); + $v2w->init_inbox(delete $opt->{jobs}); unlink $new_cfg; link_or_copy($old_cfg, $new_cfg); if (my $alt = $new->{altid}) { @@ -98,7 +132,7 @@ $clone may not be valid after migrating to v2, not copying my $state = ''; my $head = $old->{ref_head} || 'HEAD'; my ($rd, $pid) = $old->git->popen(qw(fast-export --use-done-feature), $head); -$v2w->idx_init; +$v2w->idx_init($opt); my $im = $v2w->importer; my ($r, $w) = $im->gfi_start; my $h = '[0-9a-f]'; @@ -144,10 +178,10 @@ while (<$rd>) { last if $_ eq "done\n"; print $w $_ or $im->wfail; } -$w = $r = undef; close $rd or die "close fast-export: $!\n"; waitpid($pid, 0) or die "waitpid failed: $!\n"; $? == 0 or die "fast-export failed: $?\n"; +$r = $w = undef; # v2w->done does the actual close and error checking $v2w->done; if (my $mm = $old->mm) { $old->cleanup; @@ -155,10 +189,10 @@ if (my $mm = $old->mm) { # we want to trigger a reindex, not a from scratch index if # we're reusing the msgmap from an existing v1 installation. - $v2w->idx_init; + $v2w->idx_init($opt); my $epoch0 = PublicInbox::Git->new($v2w->git_init(0)); chop(my $cmt = $epoch0->qx(qw(rev-parse --verify), $head)); $v2w->last_epoch_commit(0, $cmt); } -$v2w->index_sync({reindex => 1}) if $index; +$v2w->index_sync($opt) if delete $opt->{'index'}; $v2w->done;