about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r--lib/PublicInbox/Git.pm4
-rw-r--r--lib/PublicInbox/Inbox.pm18
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 97c39aad..77783000 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -399,16 +399,16 @@ sub async_wait_all ($) {
 # returns true if there are pending "git cat-file" processes
 sub cleanup {
         my ($self, $lazy) = @_;
-        local $in_cleanup = 1;
         return 1 if $lazy && (scalar(@{$self->{inflight_c} // []}) ||
                                 scalar(@{$self->{inflight} // []}));
+        local $in_cleanup = 1;
         delete $self->{async_cat};
         async_wait_all($self);
         delete $self->{inflight};
         delete $self->{inflight_c};
         _destroy($self, qw(cat_rbuf in out pid));
         _destroy($self, qw(chk_rbuf in_c out_c pid_c err_c));
-        defined($self->{pid}) || defined($self->{pid_c});
+        undef;
 }
 
 # assuming a well-maintained repo, this should be a somewhat
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 7c1c3afe..724df50a 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -13,6 +13,10 @@ 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) = @_;
         my $live;
@@ -21,11 +25,16 @@ sub do_cleanup {
                                         : $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)});
+        }
         $ibx->cleanup_shards and $live = 1;
         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;
 }
 
@@ -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) = @_;