From c339a14b11c57e7b330f4efef6903bcbea2b3463 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 24 May 2018 08:32:16 +0000 Subject: workaround Xapian OFD locks w/o close-on-exec Xapian v1.2.21..v1.2.24 (inclusive) use OFD locks but failed to set the close-on-exec flag on those locks. So we must continue to work around those old versions by ensuring Xapian file descriptors aren't held any longer than necessary when in long-running git processes. Reported-by: Konstantin Ryabitsev --- lib/PublicInbox/SearchIdx.pm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index 74f9267e..107cd345 100644 --- a/lib/PublicInbox/SearchIdx.pm +++ b/lib/PublicInbox/SearchIdx.pm @@ -666,6 +666,7 @@ sub _index_sync { $self->{over}->rollback_lazy; $self->{over}->disconnect; + $git->cleanup; delete $self->{txn}; $xdb->cancel_transaction; $xdb = _xdb_release($self); @@ -696,6 +697,7 @@ sub _index_sync { } } $self->commit_txn_lazy; + $git->cleanup; $xdb = _xdb_release($self); # let another process do some work... < if (!$newest) { -- cgit v1.2.3-24-ge0c7