X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FXapcmd.pm;h=7414c9b6802db909fa03046b52a92a263f017e0d;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=819d7829d37dbd95398fcaebb2163365f29d74a2;hpb=a45af9138d4a708ff7818dba91e03b6d4d22e69c;p=public-inbox.git diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm index 819d7829..7414c9b6 100644 --- a/lib/PublicInbox/Xapcmd.pm +++ b/lib/PublicInbox/Xapcmd.pm @@ -1,36 +1,37 @@ -# Copyright (C) 2018-2019 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ package PublicInbox::Xapcmd; use strict; use warnings; -use PublicInbox::Spawn qw(which spawn); +use PublicInbox::Spawn qw(which popen_rd); use PublicInbox::Over; -use PublicInbox::Search; -use File::Temp qw(tempdir); +use PublicInbox::SearchIdx; +use File::Temp 0.19 (); # ->newdir use File::Path qw(remove_tree); use File::Basename qw(dirname); +use POSIX (); # support testing with dev versions of Xapian which installs # commands with a version number suffix (e.g. "xapian-compact-1.5") our $XAPIAN_COMPACT = $ENV{XAPIAN_COMPACT} || 'xapian-compact'; our @COMPACT_OPT = qw(jobs|j=i quiet|q blocksize|b=s no-full|n fuller|F); -sub commit_changes ($$$) { - my ($ibx, $tmp, $opt) = @_; +sub commit_changes ($$$$) { + my ($ibx, $im, $tmp, $opt) = @_; my $reshard = $opt->{reshard}; my $reindex = $opt->{reindex}; - my $im = $ibx->importer(0); - $im->lock_acquire if !$opt->{-coarse_lock}; $SIG{INT} or die 'BUG: $SIG{INT} not handled'; my @old_shard; - while (my ($old, $new) = each %$tmp) { + while (my ($old, $newdir) = each %$tmp) { + next if $old eq ''; # no invalid paths my @st = stat($old); if (!@st && !defined($opt->{reshard})) { die "failed to stat($old): $!"; } + my $new = $newdir->dirname if defined($newdir); my $over = "$old/over.sqlite3"; if (-f $over) { # only for v1, v2 over is untouched defined $new or die "BUG: $over exists when culling v2"; @@ -59,7 +60,7 @@ sub commit_changes ($$$) { } } remove_tree(@old_shard); - $tmp->done; + $tmp = undef; if (!$opt->{-coarse_lock}) { $opt->{-skip_lock} = 1; @@ -77,10 +78,7 @@ sub commit_changes ($$$) { } } - PublicInbox::Admin::index_inbox($ibx, $opt); - # implicit lock_release - } else { - $im->lock_release; + PublicInbox::Admin::index_inbox($ibx, $im, $opt); } } @@ -89,7 +87,7 @@ sub cb_spawn { defined(my $pid = fork) or die "fork: $!"; return $pid if $pid > 0; $cb->($args, $opt); - exit 0; + POSIX::_exit(0); } sub runnable_or_die ($) { @@ -97,18 +95,17 @@ sub runnable_or_die ($) { which($exe) or die "$exe not found in PATH\n"; } -sub prepare_reindex ($$) { - my ($ibx, $reindex) = @_; - if ($ibx->{version} == 1) { +sub prepare_reindex ($$$) { + my ($ibx, $im, $reindex) = @_; + if ($ibx->version == 1) { my $dir = $ibx->search->xdir(1); - my $xdb = Search::Xapian::Database->new($dir); + my $xdb = $PublicInbox::Search::X{Database}->new($dir); if (my $lc = $xdb->get_metadata('last_commit')) { $reindex->{from} = $lc; } } else { # v2 - my $v2w = $ibx->importer(0); my $max; - $v2w->git_dir_latest(\$max) or return; + $im->git_dir_latest(\$max) or return; my $from = $reindex->{from}; my $mm = $ibx->mm; my $v = PublicInbox::Search::SCHEMA_VERSION(); @@ -125,7 +122,8 @@ sub same_fs_or_die ($$) { } sub process_queue { - my ($queue, $cb, $max, $opt) = @_; + my ($queue, $cb, $opt) = @_; + my $max = $opt->{jobs} || scalar(@$queue); if ($max <= 1) { while (defined(my $args = shift @$queue)) { $cb->($args, $opt); @@ -149,28 +147,19 @@ sub process_queue { } } -sub run { - my ($ibx, $task, $opt) = @_; # task = 'cpdb' or 'compact' - my $cb = \&${\"PublicInbox::Xapcmd::$task"}; - PublicInbox::Admin::progress_prepare($opt ||= {}); - my $dir = $ibx->{mainrepo} or die "no mainrepo in inbox\n"; - runnable_or_die($XAPIAN_COMPACT) if $opt->{compact}; - my $reindex; # v1:{ from => $x40 }, v2:{ from => [ $x40, $x40, .. ] } } - my $from; # per-epoch ranges +sub setup_signals () { + # http://www.tldp.org/LDP/abs/html/exitcodes.html + $SIG{INT} = sub { exit(130) }; + $SIG{HUP} = $SIG{PIPE} = $SIG{TERM} = sub { exit(1) }; +} - if (!$opt->{-coarse_lock}) { - $reindex = $opt->{reindex} = {}; - $from = $reindex->{from} = []; - require Search::Xapian::WritableDatabase; - } +sub prepare_run { + my ($ibx, $opt) = @_; + my $tmp = {}; # old shard dir => File::Temp->newdir object or undef + my @queue; # ([old//src,newdir]) - list of args for cpdb() or compact() - $ibx->umask_prepare; my $old = $ibx->search->xdir(1); -d $old or die "$old does not exist\n"; - - my $tmp = PublicInbox::Xtmpdirs->new; - my $v = $ibx->{version} ||= 1; - my @q; my $reshard = $opt->{reshard}; if (defined $reshard && $reshard <= 0) { die "--reshard must be a positive number\n"; @@ -178,17 +167,17 @@ sub run { # we want temporary directories to be as deep as possible, # so v2 shards can keep "xap$SCHEMA_VERSION" on a separate FS. - if ($v == 1) { + if ($ibx->version == 1) { if (defined $reshard) { warn -"--reshard=$reshard ignored for v1 $ibx->{mainrepo}\n"; +"--reshard=$reshard ignored for v1 $ibx->{inboxdir}\n"; } - my $old_parent = dirname($old); - same_fs_or_die($old_parent, $old); + my $dir = dirname($old); + same_fs_or_die($dir, $old); my $v = PublicInbox::Search::SCHEMA_VERSION(); - my $wip = tempdir("xapian$v-XXXXXXXX", DIR => $old_parent); + my $wip = File::Temp->newdir("xapian$v-XXXXXXXX", DIR => $dir); $tmp->{$old} = $wip; - push @q, [ $old, $wip ]; + push @queue, [ $old, $wip ]; } else { opendir my $dh, $old or die "Failed to opendir $old: $!\n"; my @old_shards; @@ -214,10 +203,10 @@ sub run { } foreach my $dn (0..$max_shard) { my $tmpl = "$dn-XXXXXXXX"; - my $wip = tempdir($tmpl, DIR => $old); - same_fs_or_die($old, $wip); + my $wip = File::Temp->newdir($tmpl, DIR => $old); + same_fs_or_die($old, $wip->dirname); my $cur = "$old/$dn"; - push @q, [ $src // $cur , $wip ]; + push @queue, [ $src // $cur , $wip ]; $tmp->{$cur} = $wip; } # mark old shards to be unlinked @@ -225,26 +214,49 @@ sub run { $tmp->{$_} ||= undef for @$src; } } - my $im = $ibx->importer(0); - my $max = $opt->{jobs} || scalar(@q); + ($tmp, \@queue); +} + +sub run { + my ($ibx, $task, $opt) = @_; # task = 'cpdb' or 'compact' + my $cb = \&${\"PublicInbox::Xapcmd::$task"}; + PublicInbox::Admin::progress_prepare($opt ||= {}); + defined(my $dir = $ibx->{inboxdir}) or die "no inboxdir defined\n"; + -d $dir or die "inboxdir=$dir does not exist\n"; + runnable_or_die($XAPIAN_COMPACT) if $opt->{compact}; + my $reindex; # v1:{ from => $x40 }, v2:{ from => [ $x40, $x40, .. ] } } + + if (!$opt->{-coarse_lock}) { + $reindex = $opt->{reindex} = {}; + $reindex->{from} = []; # per-epoch ranges + require PublicInbox::SearchIdx; + PublicInbox::SearchIdx::load_xapian_writable(); + } + + local %SIG = %SIG; + setup_signals(); + $ibx->umask_prepare; $ibx->with_umask(sub { + my $im = $ibx->importer(0); $im->lock_acquire; + my ($tmp, $queue) = prepare_run($ibx, $opt); # fine-grained locking if we prepare for reindex if (!$opt->{-coarse_lock}) { - prepare_reindex($ibx, $reindex); + prepare_reindex($ibx, $im, $reindex); $im->lock_release; } - delete($ibx->{$_}) for (qw(mm over search)); # cleanup - process_queue(\@q, $cb, $max, $opt); - commit_changes($ibx, $tmp, $opt); + $ibx->cleanup; + process_queue($queue, $cb, $opt); + $im->lock_acquire if !$opt->{-coarse_lock}; + commit_changes($ibx, $im, $tmp, $opt); }); } sub cpdb_retryable ($$) { my ($src, $pfx) = @_; - if (ref($@) eq 'Search::Xapian::DatabaseModifiedError') { + if (ref($@) =~ /\bDatabaseModifiedError\b/) { warn "$pfx Xapian DB modified, reopening and retrying\n"; $src->reopen; return 1; @@ -267,8 +279,8 @@ sub progress_pfx ($) { # xapian-compact wrapper sub compact ($$) { my ($args, $opt) = @_; - my ($src, $dst) = @$args; - my ($r, $w); + my ($src, $newdir) = @$args; + my $dst = ref($newdir) ? $newdir->dirname : $newdir; my $pfx = $opt->{-progress_pfx} ||= progress_pfx($src); my $pr = $opt->{-progress}; my $rdr = {}; @@ -277,7 +289,6 @@ sub compact ($$) { defined(my $dfd = $opt->{$fd}) or next; $rdr->{$fd} = $dfd; } - $rdr->{1} = fileno($w) if $pr && pipe($r, $w); # we rely on --no-renumber to keep docids synched to NNTP my $cmd = [ $XAPIAN_COMPACT, '--no-renumber' ]; @@ -290,18 +301,14 @@ sub compact ($$) { } $pr->("$pfx `".join(' ', @$cmd)."'\n") if $pr; push @$cmd, $src, $dst; - my $pid = spawn($cmd, undef, $rdr); - if ($pr) { - close $w or die "close: \$w: $!"; - foreach (<$r>) { + my $rd = popen_rd($cmd, undef, $rdr); + while (<$rd>) { + if ($pr) { s/\r/\r$pfx /g; $pr->("$pfx $_"); } } - my $rp = waitpid($pid, 0); - if ($? || $rp != $pid) { - die join(' ', @$cmd)." failed: $? (pid=$pid, reaped=$rp)\n"; - } + close $rd or die join(' ', @$cmd)." failed: $?n"; } sub cpdb_loop ($$$;$$) { @@ -349,9 +356,12 @@ sub cpdb_loop ($$$;$$) { # to the overhead of Perl. sub cpdb ($$) { my ($args, $opt) = @_; - my ($old, $new) = @$args; + my ($old, $newdir) = @$args; + my $new = $newdir->dirname; my ($src, $cur_shard); my $reshard; + PublicInbox::SearchIdx::load_xapian_writable() or die; + my $XapianDatabase = $PublicInbox::Search::X{Database}; if (ref($old) eq 'ARRAY') { ($cur_shard) = ($new =~ m!xap[0-9]+/([0-9]+)\b!); defined $cur_shard or @@ -362,31 +372,34 @@ sub cpdb ($$) { # resharding, M:N copy means have full read access foreach (@$old) { if ($src) { - my $sub = Search::Xapian::Database->new($_); + my $sub = $XapianDatabase->new($_); $src->add_database($sub); } else { - $src = Search::Xapian::Database->new($_); + $src = $XapianDatabase->new($_); } } } else { - $src = Search::Xapian::Database->new($old); + $src = $XapianDatabase->new($old); } - my ($xtmp, $tmp); + my ($tmp, $ft); + local %SIG = %SIG; if ($opt->{compact}) { - my $newdir = dirname($new); - same_fs_or_die($newdir, $new); - $tmp = tempdir("$new.compact-XXXXXX", DIR => $newdir); - $xtmp = PublicInbox::Xtmpdirs->new; - $xtmp->{$new} = $tmp; + my $dir = dirname($new); + same_fs_or_die($dir, $new); + $ft = File::Temp->newdir("$new.compact-XXXXXX", DIR => $dir); + setup_signals(); + $tmp = $ft->dirname; } else { $tmp = $new; } # like copydatabase(1), be sure we don't overwrite anything in case # of other bugs: - my $creat = Search::Xapian::DB_CREATE(); - my $dst = Search::Xapian::WritableDatabase->new($tmp, $creat); + my $creat = eval($PublicInbox::Search::Xap.'::DB_CREATE()'); + die if $@; + my $XapianWritableDatabase = $PublicInbox::Search::X{WritableDatabase}; + my $dst = $XapianWritableDatabase->new($tmp, $creat); my $pr = $opt->{-progress}; my $pfx = $opt->{-progress_pfx} = progress_pfx($new); my $pr_data = { pr => $pr, pfx => $pfx, nr => 0 } if $pr; @@ -429,7 +442,7 @@ sub cpdb ($$) { # individually. $src = undef; foreach (@$old) { - my $old = Search::Xapian::Database->new($_); + my $old = $XapianDatabase->new($_); cpdb_loop($old, $dst, $pr_data, $cur_shard, $reshard); } } else { @@ -437,7 +450,7 @@ sub cpdb ($$) { } $pr->(sprintf($pr_data->{fmt}, $pr_data->{nr})) if $pr; - return unless $xtmp; + return unless $opt->{compact}; $src = $dst = undef; # flushes and closes @@ -445,46 +458,6 @@ sub cpdb ($$) { # since $dst isn't readable by HTTP or NNTP clients, yet: compact([ $tmp, $new ], $opt); remove_tree($tmp) or die "failed to remove $tmp: $!\n"; - $xtmp->done; -} - -# slightly easier-to-manage manage than END{} blocks -package PublicInbox::Xtmpdirs; -use strict; -use warnings; -use File::Path qw(remove_tree); -my %owner; - -sub new { - # http://www.tldp.org/LDP/abs/html/exitcodes.html - $SIG{INT} = sub { exit(130) }; - $SIG{HUP} = $SIG{PIPE} = $SIG{TERM} = sub { exit(1) }; - my $self = bless {}, $_[0]; # old shard => new (WIP) shard - $owner{"$self"} = $$; - $self; -} - -sub done { - my ($self) = @_; - delete $owner{"$self"}; - - my %known_pids; - $known_pids{$_}++ foreach values %owner; - if (!$known_pids{$$}) { - $SIG{INT} = $SIG{HUP} = $SIG{PIPE} = $SIG{TERM} = 'DEFAULT'; - } - %$self = (); -} - -sub DESTROY { - my ($self) = @_; - my $owner_pid = delete $owner{"$self"} or return; - return if $owner_pid != $$; - foreach my $new (values %$self) { - defined $new or next; # may be undef if resharding - remove_tree($new) unless -d "$new/old"; - } - done($self); } 1;