From 0ffd4a9833da64006d558ef241badfef3c096d1b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 14 Jun 2019 17:35:04 +0000 Subject: v2: rename SearchIdxPart => SearchIdxShard Another step towards keeping our file and package names consistent with Xapian terminology. --- MANIFEST | 2 +- lib/PublicInbox/SearchIdxPart.pm | 116 -------------------------------------- lib/PublicInbox/SearchIdxShard.pm | 116 ++++++++++++++++++++++++++++++++++++++ lib/PublicInbox/V2Writable.pm | 4 +- 4 files changed, 119 insertions(+), 119 deletions(-) delete mode 100644 lib/PublicInbox/SearchIdxPart.pm create mode 100644 lib/PublicInbox/SearchIdxShard.pm diff --git a/MANIFEST b/MANIFEST index 3f0a79a6..c7693976 100644 --- a/MANIFEST +++ b/MANIFEST @@ -119,7 +119,7 @@ lib/PublicInbox/Reply.pm lib/PublicInbox/SaPlugin/ListMirror.pm lib/PublicInbox/Search.pm lib/PublicInbox/SearchIdx.pm -lib/PublicInbox/SearchIdxPart.pm +lib/PublicInbox/SearchIdxShard.pm lib/PublicInbox/SearchMsg.pm lib/PublicInbox/SearchThread.pm lib/PublicInbox/SearchView.pm diff --git a/lib/PublicInbox/SearchIdxPart.pm b/lib/PublicInbox/SearchIdxPart.pm deleted file mode 100644 index 77fb7d90..00000000 --- a/lib/PublicInbox/SearchIdxPart.pm +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright (C) 2018 all contributors -# License: AGPL-3.0+ - -# used to interface with a single Xapian shard in V2 repos. -# See L for more info on how we shard Xapian -package PublicInbox::SearchIdxPart; -use strict; -use warnings; -use base qw(PublicInbox::SearchIdx); - -sub new { - my ($class, $v2writable, $part) = @_; - my $self = $class->SUPER::new($v2writable->{-inbox}, 1, $part); - # create the DB before forking: - $self->_xdb_acquire; - $self->_xdb_release; - $self->spawn_worker($v2writable, $part) if $v2writable->{parallel}; - $self; -} - -sub spawn_worker { - my ($self, $v2writable, $part) = @_; - my ($r, $w); - pipe($r, $w) or die "pipe failed: $!\n"; - binmode $r, ':raw'; - binmode $w, ':raw'; - my $pid = fork; - defined $pid or die "fork failed: $!\n"; - if ($pid == 0) { - my $bnote = $v2writable->atfork_child; - $v2writable = undef; - close $w or die "failed to close: $!"; - - # F_SETPIPE_SZ = 1031 on Linux; increasing the pipe size here - # speeds V2Writable batch imports across 8 cores by nearly 20% - fcntl($r, 1031, 1048576) if $^O eq 'linux'; - - eval { partition_worker_loop($self, $r, $part, $bnote) }; - die "worker $part died: $@\n" if $@; - die "unexpected MM $self->{mm}" if $self->{mm}; - exit; - } - $self->{pid} = $pid; - $self->{w} = $w; - close $r or die "failed to close: $!"; -} - -sub partition_worker_loop ($$$$) { - my ($self, $r, $part, $bnote) = @_; - $0 = "pi-v2-shard[$part]"; - my $current_info = ''; - my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ }; - local $SIG{__WARN__} = sub { - chomp $current_info; - $warn_cb->("[$part] $current_info: ", @_); - }; - $self->begin_txn_lazy; - while (my $line = $r->getline) { - $current_info = $line; - if ($line eq "commit\n") { - $self->commit_txn_lazy; - } elsif ($line eq "close\n") { - $self->_xdb_release; - } elsif ($line eq "barrier\n") { - $self->commit_txn_lazy; - # no need to lock < 512 bytes is atomic under POSIX - print $bnote "barrier $part\n" or - die "write failed for barrier $!\n"; - } elsif ($line =~ /\AD ([a-f0-9]{40,}) (.+)\n\z/s) { - my ($oid, $mid) = ($1, $2); - $self->begin_txn_lazy; - $self->remove_by_oid($oid, $mid); - } else { - chomp $line; - my ($len, $artnum, $oid, $mid0) = split(/ /, $line); - $self->begin_txn_lazy; - my $n = read($r, my $msg, $len) or die "read: $!\n"; - $n == $len or die "short read: $n != $len\n"; - my $mime = PublicInbox::MIME->new(\$msg); - $artnum = int($artnum); - $self->add_message($mime, $n, $artnum, $oid, $mid0); - } - } - $self->worker_done; -} - -# called by V2Writable -sub index_raw { - my ($self, $bytes, $msgref, $artnum, $oid, $mid0, $mime) = @_; - if (my $w = $self->{w}) { - print $w "$bytes $artnum $oid $mid0\n", $$msgref or die - "failed to write shard $!\n"; - $w->flush or die "failed to flush: $!\n"; - } else { - $$msgref = undef; - $self->begin_txn_lazy; - $self->add_message($mime, $bytes, $artnum, $oid, $mid0); - } -} - -sub atfork_child { - close $_[0]->{w} or die "failed to close write pipe: $!\n"; -} - -# called by V2Writable: -sub remote_barrier { - my ($self) = @_; - if (my $w = $self->{w}) { - print $w "barrier\n" or die "failed to print: $!"; - $w->flush or die "failed to flush: $!"; - } else { - $self->commit_txn_lazy; - } -} - -1; diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm new file mode 100644 index 00000000..15ec6578 --- /dev/null +++ b/lib/PublicInbox/SearchIdxShard.pm @@ -0,0 +1,116 @@ +# Copyright (C) 2018 all contributors +# License: AGPL-3.0+ + +# used to interface with a single Xapian shard in V2 repos. +# See L for more info on how we shard Xapian +package PublicInbox::SearchIdxShard; +use strict; +use warnings; +use base qw(PublicInbox::SearchIdx); + +sub new { + my ($class, $v2writable, $shard) = @_; + my $self = $class->SUPER::new($v2writable->{-inbox}, 1, $shard); + # create the DB before forking: + $self->_xdb_acquire; + $self->_xdb_release; + $self->spawn_worker($v2writable, $shard) if $v2writable->{parallel}; + $self; +} + +sub spawn_worker { + my ($self, $v2writable, $shard) = @_; + my ($r, $w); + pipe($r, $w) or die "pipe failed: $!\n"; + binmode $r, ':raw'; + binmode $w, ':raw'; + my $pid = fork; + defined $pid or die "fork failed: $!\n"; + if ($pid == 0) { + my $bnote = $v2writable->atfork_child; + $v2writable = undef; + close $w or die "failed to close: $!"; + + # F_SETPIPE_SZ = 1031 on Linux; increasing the pipe size here + # speeds V2Writable batch imports across 8 cores by nearly 20% + fcntl($r, 1031, 1048576) if $^O eq 'linux'; + + eval { shard_worker_loop($self, $r, $shard, $bnote) }; + die "worker $shard died: $@\n" if $@; + die "unexpected MM $self->{mm}" if $self->{mm}; + exit; + } + $self->{pid} = $pid; + $self->{w} = $w; + close $r or die "failed to close: $!"; +} + +sub shard_worker_loop ($$$$) { + my ($self, $r, $shard, $bnote) = @_; + $0 = "pi-v2-shard[$shard]"; + my $current_info = ''; + my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ }; + local $SIG{__WARN__} = sub { + chomp $current_info; + $warn_cb->("[$shard] $current_info: ", @_); + }; + $self->begin_txn_lazy; + while (my $line = $r->getline) { + $current_info = $line; + if ($line eq "commit\n") { + $self->commit_txn_lazy; + } elsif ($line eq "close\n") { + $self->_xdb_release; + } elsif ($line eq "barrier\n") { + $self->commit_txn_lazy; + # no need to lock < 512 bytes is atomic under POSIX + print $bnote "barrier $shard\n" or + die "write failed for barrier $!\n"; + } elsif ($line =~ /\AD ([a-f0-9]{40,}) (.+)\n\z/s) { + my ($oid, $mid) = ($1, $2); + $self->begin_txn_lazy; + $self->remove_by_oid($oid, $mid); + } else { + chomp $line; + my ($len, $artnum, $oid, $mid0) = split(/ /, $line); + $self->begin_txn_lazy; + my $n = read($r, my $msg, $len) or die "read: $!\n"; + $n == $len or die "short read: $n != $len\n"; + my $mime = PublicInbox::MIME->new(\$msg); + $artnum = int($artnum); + $self->add_message($mime, $n, $artnum, $oid, $mid0); + } + } + $self->worker_done; +} + +# called by V2Writable +sub index_raw { + my ($self, $bytes, $msgref, $artnum, $oid, $mid0, $mime) = @_; + if (my $w = $self->{w}) { + print $w "$bytes $artnum $oid $mid0\n", $$msgref or die + "failed to write shard $!\n"; + $w->flush or die "failed to flush: $!\n"; + } else { + $$msgref = undef; + $self->begin_txn_lazy; + $self->add_message($mime, $bytes, $artnum, $oid, $mid0); + } +} + +sub atfork_child { + close $_[0]->{w} or die "failed to close write pipe: $!\n"; +} + +# called by V2Writable: +sub remote_barrier { + my ($self) = @_; + if (my $w = $self->{w}) { + print $w "barrier\n" or die "failed to print: $!"; + $w->flush or die "failed to flush: $!"; + } else { + $self->commit_txn_lazy; + } +} + +1; diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index aa13aa8f..cc9ebfed 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -7,7 +7,7 @@ package PublicInbox::V2Writable; use strict; use warnings; use base qw(PublicInbox::Lock); -use PublicInbox::SearchIdxPart; +use PublicInbox::SearchIdxShard; use PublicInbox::MIME; use PublicInbox::Git; use PublicInbox::Import; @@ -300,7 +300,7 @@ sub idx_init { # idx_parts must be visible to all forked processes my $idx = $self->{idx_parts} = []; for my $i (0..$max) { - push @$idx, PublicInbox::SearchIdxPart->new($self, $i); + push @$idx, PublicInbox::SearchIdxShard->new($self, $i); } # Now that all subprocesses are up, we can open the FDs -- cgit v1.2.3-24-ge0c7