use List::Util qw(max);
use Carp qw(croak);
-# Long-running "git-cat-file --batch" processes won't notice
-# unlinked packs, so we need to restart those processes occasionally.
-# Xapian and SQLite file handles are mostly stable, but sometimes an
-# admin will attempt to replace them atomically after compact/vacuum
-# and we need to be prepared for that.
-my $cleanup_timer;
-my $CLEANUP = {}; # string(inbox) -> inbox
-
sub git_cleanup ($) {
my ($self) = @_;
my $git = $self->{git} // return undef;
# 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
+ my $live = $self->isa(__PACKAGE__) ? $git->cleanup(1)
: $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 = git_cleanup($ibx);
- $ibx->cleanup_shards and $again = 1;
- for my $git (@{$ibx->{-repo_objs}}) {
- $again = 1 if $git->cleanup;
- }
- check_inodes($ibx);
- $next->{"$ibx"} = $ibx if $again;
+sub do_cleanup {
+ my ($ibx) = @_;
+ my $live = git_cleanup($ibx);
+ $ibx->cleanup_shards and $live = 1;
+ for my $git (@{$ibx->{-repo_objs}}) {
+ $live = 1 if $git->cleanup(1);
}
- $CLEANUP = $next;
- $cleanup_timer //= PublicInbox::DS::later(\&cleanup_task);
+ delete @$ibx{qw(over mm description cloneurl
+ -altid_map -imap_url -nntp_url)};
+ PublicInbox::DS::add_uniq_timer($ibx+0, 5, \&do_cleanup, $ibx) if $live;
}
sub _cleanup_later ($) {
# no need to require DS, here, if it were enabled another
# module would've require'd it, already
- if (eval { PublicInbox::DS::in_loop() }) {
- $cleanup_timer //= PublicInbox::DS::later(\&cleanup_task);
- $CLEANUP->{"$_[0]"} = $_[0]; # $self
- }
+ eval { PublicInbox::DS::in_loop() } and
+ PublicInbox::DS::add_uniq_timer($_[0]+0, 30, \&do_cleanup, @_)
}
sub _set_limiter ($$$) {
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");
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);
};
+ _cleanup_later($self);
my $over = PublicInbox::Over->new("$srch->{xpfx}/over.sqlite3");
$over->dbh; # may fail
- $over;
+ $self->{over} = $over;
} // ($req ? croak("E: $@") : undef);
}
sub cloneurl {
my ($self) = @_;
- ($self->{cloneurl} //= do {
+ $self->{cloneurl} // do {
my $s = try_cat("$self->{inboxdir}/cloneurl");
my @urls = split(/\s+/s, $s);
- scalar(@urls) ? \@urls : undef
- }) // [];
+ scalar(@urls) ? ($self->{cloneurl} = \@urls) : undef;
+ } // [];
}
sub base_url {
return $url .= $self->{name} . '/';
}
# called from a non-PSGI environment (e.g. NNTP/POP3):
- $self->{-base_url} ||= do {
- my $url = $self->{url} // return undef;
- $url = $url->[0] // return undef;
- # expand protocol-relative URLs to HTTPS if we're
- # not inside a web server
- $url = "https:$url" if $url =~ m!\A//!;
- $url .= '/' if $url !~ m!/\z!;
- $url;
- };
+ my $url = $self->{url} // return undef;
+ $url = $url->[0] // return undef;
+ # expand protocol-relative URLs to HTTPS if we're
+ # not inside a web server
+ substr($url, 0, 0, 'https:') if substr($url, 0, 2) eq '//';
+ $url .= '/' if substr($url, -1, 1) ne '/';
+ $url;
}
sub _x_url ($$$) {
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;
}
# (pathname is NOT public, but prefix is used for Xapian queries)
sub altid_map ($) {
my ($self) = @_;
- $self->{-altid_map} //= eval {
+ eval {
require PublicInbox::AltId;
my $altid = $self->{altid} or return {};
my %h = map {;
sub check_inodes ($) {
my ($self) = @_;
- for (qw(over mm)) { # TODO: search
+ for (qw(over mm)) {
$self->{$_}->check_inodes if $self->{$_};
}
}