X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInbox.pm;h=c0eb640f14f2630eb314e148bb33cc4ca47f53f0;hb=d304870c3c1e82f0421272e7986fc5c9aafa2889;hp=e3bc1048c23582f2e4663a6aece6a644bc71499e;hpb=a796afa762b6e204f611a69833064bf3656d1a62;p=public-inbox.git

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index e3bc1048..c0eb640f 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -7,46 +7,64 @@ use strict;
 use warnings;
 use PublicInbox::Git;
 use PublicInbox::MID qw(mid2path);
-use Devel::Peek qw(SvREFCNT);
 use PublicInbox::MIME;
-use POSIX qw(strftime);
 
+# 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;
-eval {
-	$cleanup_timer = 'disabled';
-	require PublicInbox::EvCleanup;
-	$cleanup_timer = undef; # OK if we get here
-};
-my $cleanup_broken = $@;
-
+my $cleanup_avail = -1; # 0, or 1
+my $have_devel_peek;
 my $CLEANUP = {}; # string(inbox) -> inbox
 sub cleanup_task () {
 	$cleanup_timer = undef;
 	my $next = {};
 	for my $ibx (values %$CLEANUP) {
 		my $again;
-		foreach my $f (qw(mm search)) {
-			delete $ibx->{$f} if SvREFCNT($ibx->{$f}) == 1;
+		if ($have_devel_peek) {
+			foreach my $f (qw(mm search over)) {
+				# 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
+			}
 		}
-		my $expire = time - 60;
 		if (my $git = $ibx->{git}) {
-			$again = $git->cleanup($expire);
+			$again = $git->cleanup;
 		}
 		if (my $gits = $ibx->{-repo_objs}) {
 			foreach my $git (@$gits) {
-				$again = 1 if $git->cleanup($expire);
+				$again = 1 if $git->cleanup;
 			}
 		}
-		$again ||= !!($ibx->{mm} || $ibx->{search});
+		if ($have_devel_peek) {
+			$again ||= !!($ibx->{over} || $ibx->{mm} ||
+			              $ibx->{search});
+		}
 		$next->{"$ibx"} = $ibx if $again;
 	}
 	$CLEANUP = $next;
 }
 
+sub cleanup_possible () {
+	# no need to require EvCleanup, here, if it were enabled another
+	# module would've require'd it, already
+	eval { PublicInbox::EvCleanup::enabled() } or return 0;
+
+	eval {
+		require Devel::Peek; # needs separate package in Fedora
+		$have_devel_peek = 1;
+	};
+	1;
+}
+
 sub _cleanup_later ($) {
 	my ($self) = @_;
-	return if $cleanup_broken;
-	return unless PublicInbox::EvCleanup::enabled();
+	$cleanup_avail = cleanup_possible() if $cleanup_avail < 0;
+	return if $cleanup_avail != 1;
 	$cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
 	$CLEANUP->{"$self"} = $self;
 }
@@ -56,7 +74,7 @@ sub _set_uint ($$$) {
 	my $val = $opts->{$field};
 	if (defined $val) {
 		$val = $val->[-1] if ref($val) eq 'ARRAY';
-		$val = undef if $val !~ /\A\d+\z/;
+		$val = undef if $val !~ /\A[0-9]+\z/;
 	}
 	$opts->{$field} = $val || $default;
 }
@@ -69,7 +87,7 @@ sub _set_limiter ($$$) {
 		my $mkey = $pfx.'max';
 		my $val = $self->{$mkey} or return;
 		my $lim;
-		if ($val =~ /\A\d+\z/) {
+		if ($val =~ /\A[0-9]+\z/) {
 			require PublicInbox::Qspawn;
 			$lim = PublicInbox::Qspawn::Limiter->new($val);
 		} elsif ($val =~ /\A[a-z][a-z0-9]*\z/) {
@@ -107,11 +125,11 @@ sub new {
 	bless $opts, $class;
 }
 
-sub git_part {
-	my ($self, $part) = @_;
+sub git_epoch {
+	my ($self, $epoch) = @_;
 	($self->{version} || 1) == 2 or return;
-	$self->{"$part.git"} ||= eval {
-		my $git_dir = "$self->{mainrepo}/git/$part.git";
+	$self->{"$epoch.git"} ||= eval {
+		my $git_dir = "$self->{mainrepo}/git/$epoch.git";
 		my $g = PublicInbox::Git->new($git_dir);
 		$g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
 		# no cleanup needed, we never cat-file off this, only clone
@@ -131,27 +149,27 @@ sub git {
 	};
 }
 
-sub max_git_part {
+sub max_git_epoch {
 	my ($self) = @_;
 	my $v = $self->{version};
 	return unless defined($v) && $v == 2;
-	my $part = $self->{-max_git_part};
+	my $cur = $self->{-max_git_epoch};
 	my $changed = git($self)->alternates_changed;
-	if (!defined($part) || $changed) {
+	if (!defined($cur) || $changed) {
 		$self->git->cleanup if $changed;
 		my $gits = "$self->{mainrepo}/git";
 		if (opendir my $dh, $gits) {
 			my $max = -1;
 			while (defined(my $git_dir = readdir($dh))) {
-				$git_dir =~ m!\A(\d+)\.git\z! or next;
+				$git_dir =~ m!\A([0-9]+)\.git\z! or next;
 				$max = $1 if $1 > $max;
 			}
-			$part = $self->{-max_git_part} = $max if $max >= 0;
+			$cur = $self->{-max_git_epoch} = $max if $max >= 0;
 		} else {
 			warn "opendir $gits failed: $!\n";
 		}
 	}
-	$part;
+	$cur;
 }
 
 sub mm {
@@ -172,16 +190,20 @@ sub search ($;$) {
 	my ($self, $over_only) = @_;
 	my $srch = $self->{search} ||= eval {
 		_cleanup_later($self);
-		PublicInbox::Search->new($self, $self->{altid});
+		require PublicInbox::Search;
+		PublicInbox::Search->new($self);
 	};
-	# TODO: lazily load Xapian
-	# return $srch if $over_only || eval { $srch->xdb };
-	# undef;
+	($over_only || eval { $srch->xdb }) ? $srch : undef;
 }
 
 sub over ($) {
-	my $srch = search($_[0], 1) or return;
-	$srch->{over_ro};
+	my ($self) = @_;
+	my $srch = search($self, 1) or return;
+	$self->{over} ||= eval {
+		my $over = $srch->{over_ro};
+		$over->dbh_new; # may fail
+		$over;
+	}
 }
 
 sub try_cat {
@@ -202,7 +224,7 @@ sub description {
 	local $/ = "\n";
 	chomp $desc;
 	$desc =~ s/\s+/ /smg;
-	$desc = '($REPO_DIR/description missing)' if $desc eq '';
+	$desc = '($INBOX_DIR/description missing)' if $desc eq '';
 	$self->{description} = $desc;
 }
 
@@ -289,7 +311,7 @@ sub nntp_url {
 sub nntp_usable {
 	my ($self) = @_;
 	my $ret = mm($self) && over($self);
-	$self->{mm} = $self->{search} = undef;
+	$self->{mm} = $self->{over} = $self->{search} = undef;
 	$ret;
 }