xapcmd: -xcpdb and -compact disable CoW, too

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

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 4ee3fc79195d5f59e3ff18b29761dd875675fdf6..f1c80831d91803021ad275157f1220d66c26d248 100644 (file)
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 use PublicInbox::Spawn qw(which popen_rd);
 use PublicInbox::Over;
-use PublicInbox::SearchIdx;
+use PublicInbox::SearchIdx qw(nodatacow_dir);
 use File::Temp 0.19 (); # ->newdir
 use File::Path qw(remove_tree);
 use File::Basename qw(dirname);
@@ -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);
@@ -187,6 +187,7 @@ 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 {
                opendir my $dh, $old or die "Failed to opendir $old: $!\n";
@@ -217,6 +218,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
@@ -406,16 +408,18 @@ sub cpdb ($$) {
                $ft = File::Temp->newdir("$new.compact-XXXXXX", DIR => $dir);
                setup_signals();
                $tmp = $ft->dirname;
+               nodatacow_dir($tmp);
        } else {
                $tmp = $new;
        }
 
        # like copydatabase(1), be sure we don't overwrite anything in case
        # of other bugs:
-       my $creat = eval($PublicInbox::Search::Xap.'::DB_CREATE()');
+       my $flag = eval($PublicInbox::Search::Xap.'::DB_CREATE()');
        die if $@;
        my $XapianWritableDatabase = $PublicInbox::Search::X{WritableDatabase};
-       my $dst = $XapianWritableDatabase->new($tmp, $creat);
+       $flag |= $PublicInbox::SearchIdx::DB_NO_SYNC if !$opt->{sync};
+       my $dst = $XapianWritableDatabase->new($tmp, $flag);
        my $pr = $opt->{-progress};
        my $pfx = $opt->{-progress_pfx} = progress_pfx($new);
        my $pr_data = { pr => $pr, pfx => $pfx, nr => 0 } if $pr;