inbox: expire resources more aggressively

We no longer trigger git cleanups from the Inbox package since
`git cat-file' users have their own cleanup to support git
coderepos not associated with any inbox.

This change means we unconditionally expire SQLite and Xapian
FDs and some internal caches regardless of git activity.  The
old logic was irrelevant to Gcf2 (libgit2) users anyways since
we couldn't determine whether or not an inbox was active based
on {inflight} git requests, and upcoming changes will make it
inaccurate for all extindex/cindex users as well.

Opening SQLite and Xapian DBs is fairly cheap; so it's a small
price to pay to reduce memory use and fragmentation.

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index e71ef6d2a51e806ce9536789fef77a70f79601c6..7af0ad90468f5f1004e7528137af83a63b718e28 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -12,28 +12,20 @@ use List::Util qw(max);
 use Carp qw(croak);
 use PublicInbox::Compat qw(uniqstr);
 
-# returns true if further checking is required
+# in case DBs get replaced (Xapcmd does it for v1)
 sub check_inodes ($) {
        for (qw(over mm)) { $_[0]->{$_}->check_inodes if $_[0]->{$_} }
 }
 
+# search/over/mm hold onto FDs and description+cloneurl may get updated.
+# creating long-lived allocations in the same phase as short-lived
+# allocations also leads to fragmentation, so we don't want some stuff
+# living too long.
 sub do_cleanup {
        my ($ibx) = @_;
-       my $live;
-       if (defined $ibx->{git}) {
-               $live = $ibx->isa(__PACKAGE__) ? $ibx->{git}->cleanup(1)
-                                       : $ibx->{git}->cleanup_if_unlinked;
-               delete($ibx->{git}) unless $live;
-       }
-       if ($live) {
-               check_inodes($ibx);
-       } else {
-               delete(@$ibx{qw(over mm description cloneurl
-                               -imap_url -nntp_url -pop3_url)});
-       }
-       my $srch = $ibx->{search} // $ibx;
+       my ($srch) = delete @$ibx{qw(search over mm description cloneurl)};
+       $srch //= $ibx; # extsearch
        delete @$srch{qw(xdb qp)};
-       PublicInbox::DS::add_uniq_timer($ibx+0, 5, \&do_cleanup, $ibx) if $live;
 }
 
 sub _cleanup_later ($) {
@@ -370,7 +362,7 @@ sub unsubscribe_unlock {
 # called by inotify
 sub on_unlock {
        my ($self) = @_;
-       check_inodes($self);
+       check_inodes($self); # DB files may be replaced while holding lock
        my $subs = $self->{unlock_subs} or return;
        for my $obj (values %$subs) {
                eval { $obj->on_inbox_unlock($self) };