X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FXapcmd.pm;h=e37eece5937f52bead48cb24aa8cd18737eea40c;hb=dd80dcaa1e46543893de533938a1651639f91f10;hp=9791f02cf76aaf7ecff9d8f8419d5b2843a41ec1;hpb=b38ffe92ee5ccb5eb4e5892e8cafba85303cadfc;p=public-inbox.git

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 9791f02c..e37eece5 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -61,14 +61,14 @@ sub commit_changes ($$$$) {
 	}
 
 	# trigger ->check_inodes in read-only daemons
-	syswrite($im->{lockfh}, '.') if $over_chg;
+	syswrite($im->{lockfh}, '.') if $over_chg && $im;
 
 	remove_tree(@old_shard);
 	$tmp = undef;
 	if (!$opt->{-coarse_lock}) {
 		$opt->{-skip_lock} = 1;
-
-		if ($im->can('count_shards')) {
+		$im //= $ibx if $ibx->can('eidx_sync');
+		if ($im->can('count_shards')) { # v2w or eidx
 			my $pr = $opt->{-progress};
 			my $n = $im->count_shards;
 			if (defined $reshard && $n != $reshard) {
@@ -83,7 +83,11 @@ sub commit_changes ($$$$) {
 		}
 		my $env = $opt->{-idx_env};
 		local %ENV = (%ENV, %$env) if $env;
-		PublicInbox::Admin::index_inbox($ibx, $im, $opt);
+		if ($ibx->can('eidx_sync')) {
+			$ibx->eidx_sync($opt);
+		} else {
+			PublicInbox::Admin::index_inbox($ibx, $im, $opt);
+		}
 	}
 }
 
@@ -103,9 +107,10 @@ sub runnable_or_die ($) {
 	which($exe) or die "$exe not found in PATH\n";
 }
 
-sub prepare_reindex ($$$) {
-	my ($ibx, $im, $opt) = @_;
-	if ($ibx->version == 1) {
+sub prepare_reindex ($$) {
+	my ($ibx, $opt) = @_;
+	if ($ibx->can('eidx_sync')) { # no prep needed for ExtSearchIdx
+	} elsif ($ibx->version == 1) {
 		my $dir = $ibx->search->xdir(1);
 		my $xdb = $PublicInbox::Search::X{Database}->new($dir);
 		if (my $lc = $xdb->get_metadata('last_commit')) {
@@ -172,9 +177,14 @@ 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;
-	if (my $srch = $ibx->search) {
+	my ($old, $misc_ok);
+	if ($ibx->can('eidx_sync')) {
+		$misc_ok = 1;
+		$old = $ibx->xdir(1);
+	} elsif (my $srch = $ibx->search) {
 		$old = $srch->xdir(1);
+	}
+	if (defined $old) {
 		-d $old or die "$old does not exist\n";
 	}
 	my $reshard = $opt->{reshard};
@@ -184,7 +194,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 ($old && $ibx->version == 1) {
+	if (defined($old) && $ibx->can('version') && $ibx->version == 1) {
 		if (defined $reshard) {
 			warn
 "--reshard=$reshard ignored for v1 $ibx->{inboxdir}\n";
@@ -196,7 +206,7 @@ sub prepare_run {
 		$tmp->{$old} = $wip;
 		nodatacow_dir($wip->dirname);
 		push @queue, [ $old, $wip ];
-	} elsif ($old) {
+	} elsif (defined $old) {
 		opendir my $dh, $old or die "Failed to opendir $old: $!\n";
 		my @old_shards;
 		while (defined(my $dn = readdir($dh))) {
@@ -204,6 +214,7 @@ sub prepare_run {
 				push @old_shards, $dn;
 			} elsif ($dn eq '.' || $dn eq '..') {
 			} elsif ($dn =~ /\Aover\.sqlite3/) {
+			} elsif ($dn eq 'misc' && $misc_ok) {
 			} else {
 				warn "W: skipping unknown dir: $old/$dn\n"
 			}
@@ -239,19 +250,19 @@ sub check_compact () { runnable_or_die($XAPIAN_COMPACT) }
 
 sub _run { # with_umask callback
 	my ($ibx, $cb, $opt) = @_;
-	my $im = $ibx->importer(0);
-	$im->lock_acquire;
+	my $im = $ibx->can('importer') ? $ibx->importer(0) : undef;
+	($im // $ibx)->lock_acquire;
 	my ($tmp, $queue) = prepare_run($ibx, $opt);
 
 	# fine-grained locking if we prepare for reindex
 	if (!$opt->{-coarse_lock}) {
-		prepare_reindex($ibx, $im, $opt);
-		$im->lock_release;
+		prepare_reindex($ibx, $opt);
+		($im // $ibx)->lock_release;
 	}
 
-	$ibx->cleanup;
+	$ibx->cleanup if $ibx->can('cleanup');
 	process_queue($queue, $cb, $opt);
-	$im->lock_acquire if !$opt->{-coarse_lock};
+	($im // $ibx)->lock_acquire if !$opt->{-coarse_lock};
 	commit_changes($ibx, $im, $tmp, $opt);
 }
 
@@ -259,11 +270,16 @@ sub run {
 	my ($ibx, $task, $opt) = @_; # task = 'cpdb' or 'compact'
 	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";
+	my $dir;
+	for my $fld (qw(inboxdir topdir)) {
+		my $d = $ibx->{$fld} // next;
+		-d $d or die "$fld=$d does not exist\n";
+		$dir = $d;
+		last;
+	}
 	check_compact() if $opt->{compact} && $ibx->search;
 
-	if (!$opt->{-coarse_lock}) {
+	if (!$ibx->can('eidx_sync') && !$opt->{-coarse_lock}) {
 		# per-epoch ranges for v2
 		# v1:{ from => $OID }, v2:{ from => [ $OID, $OID, $OID ] } }
 		$opt->{reindex} = { from => $ibx->version == 1 ? '' : [] };
@@ -393,7 +409,7 @@ sub cpdb ($$) { # cb_spawn callback
 	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!);
+		($cur_shard) = ($new =~ m!(?:xap|ei)[0-9]+/([0-9]+)\b!);
 		defined $cur_shard or
 			die "BUG: could not extract shard # from $new";
 		$reshard = $opt->{reshard};