xapcmd: simplify sub reference

[public-inbox.git] / lib / PublicInbox / Xapcmd.pm

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index d6c069d75efe25535579fe46505cabee1b245290..6fcc9e90cd42e45d22eee17993bf2edc84fec028 100644 (file)
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -2,8 +2,8 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 package PublicInbox::Xapcmd;
 use strict;
-use warnings;
-use PublicInbox::Spawn qw(which popen_rd);
+use PublicInbox::Spawn qw(which popen_rd nodatacow_dir);
+use PublicInbox::Admin qw(setup_signals);
 use PublicInbox::Over;
 use PublicInbox::SearchIdx;
 use File::Temp 0.19 (); # ->newdir
@@ -53,7 +53,6 @@ sub commit_changes ($$$$) {
                        rename($old, "$new/old") or
                                        die "rename $old => $new/old: $!\n";
                }
-               # Xtmpdir->DESTROY won't remove $new after this:
                rename($new, $old) or die "rename $new => $old: $!\n";
                if (@st) {
                        my $prev = "$old/old";
@@ -127,9 +126,14 @@ sub same_fs_or_die ($$) {
        die "$x and $y reside on different filesystems\n";
 }
 
+sub kill_pids {
+       my ($sig, $pids) = @_;
+       kill($sig, keys %$pids); # pids may be empty
+}
+
 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);
@@ -139,6 +143,8 @@ sub process_queue {
 
        # run in parallel:
        my %pids;
+       local %SIG = %SIG;
+       setup_signals(\&kill_pids, \%pids);
        while (@$queue) {
                while (scalar(keys(%pids)) < $max && scalar(@$queue)) {
                        my $args = shift @$queue;
@@ -157,19 +163,15 @@ sub process_queue {
        }
 }
 
-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) };
-}
-
 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()
-
-       my $old = $ibx->search->xdir(1);
-       -d $old or die "$old does not exist\n";
+       my $old;
+       if (my $srch = $ibx->search) {
+               $old = $srch->xdir(1);
+               -d $old or die "$old does not exist\n";
+       }
        my $reshard = $opt->{reshard};
        if (defined $reshard && $reshard <= 0) {
                die "--reshard must be a positive number\n";
@@ -177,7 +179,7 @@ sub prepare_run {
 
        # we want temporary directories to be as deep as possible,
        # so v2 shards can keep "xap$SCHEMA_VERSION" on a separate FS.
-       if ($ibx->version == 1) {
+       if ($old && $ibx->version == 1) {
                if (defined $reshard) {
                        warn
 "--reshard=$reshard ignored for v1 $ibx->{inboxdir}\n";
@@ -187,8 +189,9 @@ sub prepare_run {
                my $v = PublicInbox::Search::SCHEMA_VERSION();
                my $wip = File::Temp->newdir("xapian$v-XXXXXXXX", DIR => $dir);
                $tmp->{$old} = $wip;
+               nodatacow_dir($wip->dirname);
                push @queue, [ $old, $wip ];
-       } else {
+       } elsif ($old) {
                opendir my $dh, $old or die "Failed to opendir $old: $!\n";
                my @old_shards;
                while (defined(my $dn = readdir($dh))) {
@@ -217,6 +220,7 @@ sub prepare_run {
                        same_fs_or_die($old, $wip->dirname);
                        my $cur = "$old/$dn";
                        push @queue, [ $src // $cur , $wip ];
+                       nodatacow_dir($wip->dirname);
                        $tmp->{$cur} = $wip;
                }
                # mark old shards to be unlinked
@@ -249,18 +253,17 @@ sub _run {
 
 sub run {
        my ($ibx, $task, $opt) = @_; # task = 'cpdb' or 'compact'
-       my $cb = \&${\"PublicInbox::Xapcmd::$task"};
+       my $cb = \&$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";
-       check_compact() if $opt->{compact};
+       check_compact() if $opt->{compact} && $ibx->search;
        my $reindex; # v1:{ from => $x40 }, v2:{ from => [ $x40, $x40, .. ] } }
 
        if (!$opt->{-coarse_lock}) {
                $reindex = $opt->{reindex} = { # per-epoch ranges for v2
                        from => $ibx->version == 1 ? '' : [],
                };
-               require PublicInbox::SearchIdx;
                PublicInbox::SearchIdx::load_xapian_writable();
        }
 
@@ -292,6 +295,11 @@ sub progress_pfx ($) {
        ($p[-1] =~ /\A([0-9]+)/) ? "$p[-2]/$1" : $p[-1];
 }
 
+sub kill_compact { # setup_signals callback
+       my ($sig, $pidref) = @_;
+       kill($sig, $$pidref) if defined($$pidref);
+}
+
 # xapian-compact wrapper
 sub compact ($$) {
        my ($args, $opt) = @_;
@@ -317,14 +325,18 @@ sub compact ($$) {
        }
        $pr->("$pfx `".join(' ', @$cmd)."'\n") if $pr;
        push @$cmd, $src, $dst;
-       my $rd = popen_rd($cmd, undef, $rdr);
+       my ($rd, $pid);
+       local %SIG = %SIG;
+       setup_signals(\&kill_compact, \$pid);
+       ($rd, $pid) = popen_rd($cmd, undef, $rdr);
        while (<$rd>) {
                if ($pr) {
                        s/\r/\r$pfx /g;
                        $pr->("$pfx $_");
                }
        }
-       close $rd or die join(' ', @$cmd)." failed: $?n";
+       waitpid($pid, 0);
+       die "@$cmd failed: \$?=$?\n" if $?;
 }
 
 sub cpdb_loop ($$$;$$) {
@@ -406,6 +418,7 @@ sub cpdb ($$) {
                $ft = File::Temp->newdir("$new.compact-XXXXXX", DIR => $dir);
                setup_signals();
                $tmp = $ft->dirname;
+               nodatacow_dir($tmp);
        } else {
                $tmp = $new;
        }
@@ -415,7 +428,7 @@ sub cpdb ($$) {
        my $flag = eval($PublicInbox::Search::Xap.'::DB_CREATE()');
        die if $@;
        my $XapianWritableDatabase = $PublicInbox::Search::X{WritableDatabase};
-       $flag |= $PublicInbox::SearchIdx::DB_NO_SYNC if !$opt->{sync};
+       $flag |= $PublicInbox::SearchIdx::DB_NO_SYNC if !$opt->{fsync};
        my $dst = $XapianWritableDatabase->new($tmp, $flag);
        my $pr = $opt->{-progress};
        my $pfx = $opt->{-progress_pfx} = progress_pfx($new);