daemon: unconditionally close Xapian shards on cleanup

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 7c1c3afedf2dc281acf4e5fef9b18497b32db5cd..61d153bfab289c4885bfe828163ab48891467754 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -11,7 +11,9 @@ use List::Util qw(max);
 use Carp qw(croak);
 
 # returns true if further checking is required
-sub cleanup_shards { $_[0]->{search} ? $_[0]->{search}->cleanup_shards : undef }
+sub check_inodes ($) {
+       for (qw(over mm)) { $_[0]->{$_}->check_inodes if $_[0]->{$_} }
+}
 
 sub do_cleanup {
        my ($ibx) = @_;
@@ -21,11 +23,17 @@ sub do_cleanup {
                                        : $ibx->{git}->cleanup_if_unlinked;
                delete($ibx->{git}) unless $live;
        }
-       $ibx->cleanup_shards and $live = 1;
+       if ($live) {
+               check_inodes($ibx);
+       } else {
+               delete(@$ibx{qw(over mm description cloneurl
+                               -imap_url -nntp_url)});
+       }
+       my $srch = $ibx->{search} // $ibx;
+       delete @$srch{qw(xdb qp)};
        for my $git (@{$ibx->{-repo_objs} // []}) {
                $live = 1 if $git->cleanup(1);
        }
-       delete(@$ibx{qw(over mm description cloneurl -imap_url -nntp_url)});
        PublicInbox::DS::add_uniq_timer($ibx+0, 5, \&do_cleanup, $ibx) if $live;
 }
 
@@ -129,17 +137,18 @@ sub max_git_epoch {
        $cur;
 }
 
+sub mm_file {
+       my ($self) = @_;
+       my $d = $self->{inboxdir};
+       ($self->version >= 2 ? $d : "$d/public-inbox").'/msgmap.sqlite3';
+}
+
 sub mm {
        my ($self, $req) = @_;
        $self->{mm} //= eval {
                require PublicInbox::Msgmap;
                _cleanup_later($self);
-               my $dir = $self->{inboxdir};
-               if ($self->version >= 2) {
-                       PublicInbox::Msgmap->new_file("$dir/msgmap.sqlite3");
-               } else {
-                       PublicInbox::Msgmap->new($dir);
-               }
+               PublicInbox::Msgmap->new_file(mm_file($self));
        } // ($req ? croak("E: $@") : undef);
 }
 
@@ -362,13 +371,6 @@ sub unsubscribe_unlock {
        delete $self->{unlock_subs}->{$ident};
 }
 
-sub check_inodes ($) {
-       my ($self) = @_;
-       for (qw(over mm)) {
-               $self->{$_}->check_inodes if $self->{$_};
-       }
-}
-
 # called by inotify
 sub on_unlock {
        my ($self) = @_;