for my $ibx (values %$CLEANUP) {
my $again;
if ($have_devel_peek) {
- foreach my $f (qw(mm search over)) {
+ 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;
$again = 1 if $git->cleanup;
}
}
+ check_inodes($ibx);
if ($have_devel_peek) {
- $again ||= !!($ibx->{over} || $ibx->{mm} ||
- $ibx->{search});
+ $again ||= !!$ibx->{search};
}
$next->{"$ibx"} = $ibx if $again;
}
my ($self) = @_;
$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, $over_only) = @_;
+sub search ($;$$) {
+ my ($self, $over_only, $ctx) = @_;
my $srch = $self->{search} ||= eval {
_cleanup_later($self);
require PublicInbox::Search;
PublicInbox::Search->new($self);
};
- ($over_only || eval { $srch->xdb }) ? $srch : undef;
+ ($over_only || eval { $srch->xdb }) ? $srch : do {
+ $ctx and $ctx->{env}->{'psgi.errors'}->print(<<EOF);
+`$self->{name}' search went away unexpectedly
+EOF
+ undef;
+ };
}
sub over ($) {
my ($self) = @_;
my $srch = search($self, 1) or return;
- $self->{over} ||= eval {
+ $self->{over} //= eval {
my $over = $srch->{over_ro};
- $over->dbh_new; # may fail
+ $over->connect; # may fail
$over;
}
}
delete $self->{unlock_subs}->{$ident};
}
+sub check_inodes ($) {
+ my ($self) = @_;
+ for (qw(over mm)) { # TODO: search
+ $self->{$_}->check_inodes if $self->{$_};
+ }
+}
+
# called by inotify
sub on_unlock {
my ($self) = @_;
+ check_inodes($self);
my $subs = $self->{unlock_subs} or return;
for (values %$subs) {
eval { $_->on_inbox_unlock($self) };
+ warn "E: $@ ($self->{inboxdir})\n" if $@;
}
}