about summary refs log tree commit homepage
path: root/lib/PublicInbox/SearchIdxShard.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-11-03 06:48:58 +0000
committerEric Wong <e@80x24.org>2019-11-03 06:49:50 +0000
commit17d2778c404c25c459f320a7f92913d17569fc59 (patch)
tree48ae0dddf6acd5f8c3434119cbafd62ac881d575 /lib/PublicInbox/SearchIdxShard.pm
parent4821798351defce82c102e46d6f5f84f0cdc0e34 (diff)
downloadpublic-inbox-17d2778c404c25c459f320a7f92913d17569fc59.tar.gz
We don't want to define $SIG{__WARN__} in the worker to call an
existing non-default callback.  Instead update ->{current_info}
the same way the V2Writable master process does.

I noticed this while reindexing with a large XAPIAN_FLUSH_THRESHOLD
and seeing the wrong epoch on my terminal from a shard because the
shard worker was spawned while reindexing a higher-numbered epoch.
Diffstat (limited to 'lib/PublicInbox/SearchIdxShard.pm')
-rw-r--r--lib/PublicInbox/SearchIdxShard.pm19
1 files changed, 6 insertions, 13 deletions
diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index e27d0e64..b22e51dc 100644
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -19,7 +19,7 @@ sub new {
 }
 
 sub spawn_worker {
-        my ($self, $v2writable, $shard) = @_;
+        my ($self, $v2w, $shard) = @_;
         my ($r, $w);
         pipe($r, $w) or die "pipe failed: $!\n";
         binmode $r, ':raw';
@@ -27,15 +27,14 @@ sub spawn_worker {
         my $pid = fork;
         defined $pid or die "fork failed: $!\n";
         if ($pid == 0) {
-                my $bnote = $v2writable->atfork_child;
-                $v2writable = undef;
+                my $bnote = $v2w->atfork_child;
                 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) };
+                eval { shard_worker_loop($self, $v2w, $r, $shard, $bnote) };
                 die "worker $shard died: $@\n" if $@;
                 die "unexpected MM $self->{mm}" if $self->{mm};
                 exit;
@@ -45,18 +44,12 @@ sub spawn_worker {
         close $r or die "failed to close: $!";
 }
 
-sub shard_worker_loop ($$$$) {
-        my ($self, $r, $shard, $bnote) = @_;
+sub shard_worker_loop ($$$$$) {
+        my ($self, $v2w, $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;
+                $v2w->{current_info} = "[$shard] $line";
                 if ($line eq "commit\n") {
                         $self->commit_txn_lazy;
                 } elsif ($line eq "close\n") {