over: remove forked subprocess

[public-inbox.git] / lib / PublicInbox / SearchIdxPart.pm

diff --git a/lib/PublicInbox/SearchIdxPart.pm b/lib/PublicInbox/SearchIdxPart.pm
index dd7ace67adcf04b09abb9d217676c4d53f8da3ba..078d2df18d931235bc0f0087e08c6f89342583eb 100644 (file)
--- a/lib/PublicInbox/SearchIdxPart.pm
+++ b/lib/PublicInbox/SearchIdxPart.pm
@@ -6,9 +6,17 @@ use warnings;
 use base qw(PublicInbox::SearchIdx);
 
 sub new {
-       my ($class, $v2writable, $part, $skel) = @_;
+       my ($class, $v2writable, $part) = @_;
        my $self = $class->SUPER::new($v2writable->{-inbox}, 1, $part);
-       $self->{skeleton} = $skel;
+       # 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';
@@ -16,52 +24,46 @@ sub new {
        my $pid = fork;
        defined $pid or die "fork failed: $!\n";
        if ($pid == 0) {
-               $v2writable->atfork_child;
+               my $bnote = $v2writable->atfork_child;
                $v2writable = undef;
-               close $w;
+               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) };
+               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;
-       $self;
+       close $r or die "failed to close: $!";
 }
 
-sub partition_worker_loop ($$$) {
-       my ($self, $r, $part) = @_;
+sub partition_worker_loop ($$$$) {
+       my ($self, $r, $part, $bnote) = @_;
        $0 = "pi-v2-partition[$part]";
-       my $xdb = $self->_xdb_acquire;
-       $xdb->begin_transaction;
-       my $txn = 1;
+       $self->begin_txn_lazy;
        while (my $line = $r->getline) {
                if ($line eq "commit\n") {
-                       $xdb->commit_transaction if $txn;
-                       $txn = undef;
-                       $self->{skeleton}->remote_commit;
+                       $self->commit_txn_lazy;
                } elsif ($line eq "close\n") {
                        $self->_xdb_release;
-                       $xdb = $txn = undef;
                } elsif ($line eq "barrier\n") {
-                       $xdb->commit_transaction if $txn;
-                       $txn = undef;
-                       print { $self->{skeleton}->{w} } "barrier $part\n" or
-                                       die "write failed to skeleton: $!\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);
-                       $xdb ||= $self->_xdb_acquire;
-                       if (!$txn) {
-                               $xdb->begin_transaction;
-                               $txn = 1;
-                       }
+                       $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);
@@ -69,17 +71,21 @@ sub partition_worker_loop ($$$) {
                        $self->add_message($mime, $n, $artnum, $oid, $mid0);
                }
        }
-       warn "$$ still in transaction\n" if $txn;
-       warn "$$ xdb active\n" if $xdb;
+       $self->worker_done;
 }
 
 # called by V2Writable
 sub index_raw {
-       my ($self, $len, $msgref, $artnum, $object_id, $mid0) = @_;
-       my $w = $self->{w};
-       print $w "$len $artnum $object_id $mid0\n", $$msgref or die
-               "failed to write partition $!\n";
-       $w->flush or die "failed to flush: $!\n";
+       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 partition $!\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 {
@@ -87,10 +93,14 @@ sub atfork_child {
 }
 
 # called by V2Writable:
-sub barrier {
-       my $w = $_[0]->{w};
-       print $w "barrier\n" or die "failed to print: $!";
-       $w->flush or die "failed to flush: $!";
+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;