# admin will attempt to replace them atomically after compact/vacuum
# and we need to be prepared for that.
my $cleanup_timer;
-my $cleanup_avail = -1; # 0, or 1
-my $have_devel_peek;
my $CLEANUP = {}; # string(inbox) -> inbox
sub git_cleanup ($) {
my ($self) = @_;
- my $git = $self->{git} or return;
- $git->cleanup;
+ my $git = $self->{git} // return undef;
+ # normal inboxes have low startup cost and there may be many, so
+ # keep process+pipe counts in check. ExtSearch may have high startup
+ # cost (e.g. ->ALL) and but likely one per-daemon, so cleanup only
+ # if there's unlinked files
+ my $live = $self->isa(__PACKAGE__) ? $git->cleanup
+ : $git->cleanup_if_unlinked;
+ delete($self->{git}) unless $live;
+ $live;
}
+# returns true if further checking is required
+sub cleanup_shards { $_[0]->{search} ? $_[0]->{search}->cleanup_shards : undef }
+
sub cleanup_task () {
$cleanup_timer = undef;
my $next = {};
for my $ibx (values %$CLEANUP) {
- my $again;
- if ($have_devel_peek) {
- foreach my $f (qw(search)) {
- # we bump refcnt by assigning tmp, here:
- my $tmp = $ibx->{$f} or next;
- next if Devel::Peek::SvREFCNT($tmp) > 2;
- delete $ibx->{$f};
- # refcnt is zero when tmp is out-of-scope
- }
- }
- git_cleanup($ibx);
- if (my $gits = $ibx->{-repo_objs}) {
- foreach my $git (@$gits) {
- $again = 1 if $git->cleanup;
- }
+ my $again = git_cleanup($ibx);
+ $ibx->cleanup_shards and $again = 1;
+ for my $git (@{$ibx->{-repo_objs}}) {
+ $again = 1 if $git->cleanup;
}
check_inodes($ibx);
- if ($have_devel_peek) {
- $again ||= !!$ibx->{search};
- }
$next->{"$ibx"} = $ibx if $again;
}
$CLEANUP = $next;
+ $cleanup_timer //= PublicInbox::DS::later(\&cleanup_task);
}
-sub cleanup_possible () {
+sub _cleanup_later ($) {
# no need to require DS, here, if it were enabled another
# module would've require'd it, already
- eval { PublicInbox::DS::in_loop() } or return 0;
-
- eval {
- require Devel::Peek; # needs separate package in Fedora
- $have_devel_peek = 1;
- };
- 1;
-}
-
-sub _cleanup_later ($) {
- my ($self) = @_;
- $cleanup_avail = cleanup_possible() if $cleanup_avail < 0;
- return if $cleanup_avail != 1;
- $cleanup_timer //= PublicInbox::DS::later(\&cleanup_task);
- $CLEANUP->{"$self"} = $self;
+ if (eval { PublicInbox::DS::in_loop() }) {
+ $cleanup_timer //= PublicInbox::DS::later(\&cleanup_task);
+ $CLEANUP->{"$_[0]"} = $_[0]; # $self
+ }
}
sub _set_limiter ($$$) {
sub git_epoch {
my ($self, $epoch) = @_; # v2-only, callers always supply $epoch
- $self->{"$epoch.git"} ||= do {
+ $self->{"$epoch.git"} //= do {
my $git_dir = "$self->{inboxdir}/git/$epoch.git";
return unless -d $git_dir;
my $g = PublicInbox::Git->new($git_dir);
- $g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
+ my $lim = $self->{-httpbackend_limiter};
+ $g->{-httpbackend_limiter} = $lim if $lim;
# caller must manually cleanup when done
$g;
};
sub git {
my ($self) = @_;
- $self->{git} ||= do {
+ $self->{git} //= do {
my $git_dir = $self->{inboxdir};
$git_dir .= '/all.git' if $self->version == 2;
my $g = PublicInbox::Git->new($git_dir);
- $g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
+ my $lim = $self->{-httpbackend_limiter};
+ $g->{-httpbackend_limiter} = $lim if $lim;
_cleanup_later($self);
$g;
};
sub search {
my ($self) = @_;
- my $srch = $self->{search} //= eval {
+ $self->{search} // eval {
_cleanup_later($self);
require PublicInbox::Search;
- PublicInbox::Search->new($self);
+ my $srch = PublicInbox::Search->new($self);
+ (eval { $srch->xdb }) ? ($self->{search} = $srch) : undef;
};
- (eval { $srch->xdb }) ? $srch : undef;
}
# isrch is preferred for read-only interfaces if available since it
sub over {
my ($self, $req) = @_;
- $self->{over} //= eval {
- my $srch = $self->{search} //= do {
- _cleanup_later($self);
+ $self->{over} // eval {
+ my $srch = $self->{search} // do {
require PublicInbox::Search;
PublicInbox::Search->new($self);
};
my $over = PublicInbox::Over->new("$srch->{xpfx}/over.sqlite3");
$over->dbh; # may fail
- $over;
+ $self->{over} = $over;
} // ($req ? croak("E: $@") : undef);
}
sub nntp_usable {
my ($self) = @_;
my $ret = mm($self) && over($self);
- $self->{mm} = $self->{over} = $self->{search} = undef;
+ delete @$self{qw(mm over search)};
$ret;
}