From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] search: disable batching in newer versions of Xapian, for now
Date: Fri, 5 Aug 2016 22:14:25 +0000 [thread overview]
Message-ID: <20160805221425.23553-1-e@80x24.org> (raw)
This warrants further investigation, but it appears we cannot
release Xapian reliably after forking "git log" due to the
lack of a close-on-exec flag on the Xapian flintlock FD
---
lib/PublicInbox/SearchIdx.pm | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index f8249c5..a69428a 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -28,6 +28,12 @@ use constant {
PERM_EVERYBODY => 0664,
};
+# XXX temporary hack...
+my $xap_ver = ((Search::Xapian::major_version << 16) |
+ (Search::Xapian::minor_version << 8 ) |
+ Search::Xapian::revision());
+our $XAP_LOCK_BROKEN = $xap_ver >= 0x010216; # >= 1.2.22
+
sub new {
my ($class, $git_dir, $writable) = @_;
my $dir = PublicInbox::Search->xdir($git_dir);
@@ -42,7 +48,7 @@ sub new {
if ($writable == 1) {
require File::Path;
File::Path::mkpath($dir);
- $self->{batch_size} = 100;
+ $self->{batch_size} = 100 unless $XAP_LOCK_BROKEN;
$flag = Search::Xapian::DB_CREATE_OR_OPEN;
_lock_acquire($self);
}
@@ -56,16 +62,14 @@ sub _xdb_release {
my $xdb = delete $self->{xdb};
$xdb->commit_transaction;
$xdb->close;
- _lock_release($self);
}
sub _xdb_acquire {
- my ($self) = @_;
- _lock_acquire($self);
+ my ($self, $more) = @_;
my $dir = PublicInbox::Search->xdir($self->{git_dir});
my $flag = Search::Xapian::DB_OPEN;
my $xdb = Search::Xapian::WritableDatabase->new($dir, $flag);
- $xdb->begin_transaction;
+ $xdb->begin_transaction if $more;
$self->{xdb} = $xdb;
}
@@ -399,10 +403,19 @@ sub _index_sync {
$mm->last_commit($commit) if $commit;
$dbh->commit;
}
- _xdb_release($self);
+ if ($XAP_LOCK_BROKEN) {
+ $xdb->commit_transaction if !$more;
+ } else {
+ $xdb = undef;
+ _xdb_release($self);
+ _lock_release($self);
+ }
# let another process do some work...
- $dbh->begin_work if $dbh && $more;
- $xdb = _xdb_acquire($self);
+ if (!$XAP_LOCK_BROKEN) {
+ _lock_acquire($self);
+ $dbh->begin_work if $dbh && $more;
+ $xdb = _xdb_acquire($self, $more);
+ }
};
my $range = $lx eq '' ? $tip : "$lx..$tip";
--
EW
reply other threads:[~2016-08-05 22:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160805221425.23553-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).