#
# Local storage (cache/memo) for lei(1), suitable for personal/private
# mail iff on encrypted device/FS. Based on v2, but only deduplicates
-# based on git OID.
+# git storage based on git OID (index deduplication is done in ContentHash)
#
# for xref3, the following are constant: $eidx_key = '.', $xnum = -1
+#
+# We rely on the synchronous IPC API for this in lei-daemon and
+# multiple lei clients to write to it at once. This allows the
+# lei/store IPC process to be decoupled from network latency in
+# lei WQ workers.
package PublicInbox::LeiStore;
use strict;
use v5.10.1;
use parent qw(PublicInbox::Lock PublicInbox::IPC);
use PublicInbox::ExtSearchIdx;
+use PublicInbox::Eml;
use PublicInbox::Import;
use PublicInbox::InboxWritable qw(eml_from_path);
use PublicInbox::V2Writable;
use PublicInbox::MID qw(mids);
use PublicInbox::LeiSearch;
use PublicInbox::MDA;
+use PublicInbox::Spawn qw(spawn);
use List::Util qw(max);
+use File::Temp ();
+use POSIX ();
sub new {
my (undef, $dir, $opt) = @_;
my $rdr = {};
open $rdr->{2}, '>', '/dev/null' or die "open /dev/null: $!";
chomp(my $i = $git->qx([qw(var GIT_COMMITTER_IDENT)], undef, $rdr));
- $i =~ /\A(.+) <([^>]+)> [0-9]+ [-\+]?[0-9]+$/ ? ($1, $2) :
- ('lei user', 'x@example.com')
+ $i =~ /\A(.+) <([^>]+)> [0-9]+ [-\+]?[0-9]+$/ and return ($1, $2);
+ my ($user, undef, undef, undef, undef, undef, $gecos) = getpwuid($<);
+ ($user) = (($user // $ENV{USER} // '') =~ /([\w\-\.\+]+)/);
+ $user //= 'lei-user';
+ ($gecos) = (($gecos // '') =~ /([\w\-\.\+ \t]+)/);
+ $gecos //= 'lei user';
+ require Sys::Hostname;
+ my ($host) = (Sys::Hostname::hostname() =~ /([\w\-\.]+)/);
+ $host //= 'localhost';
+ ($gecos, "$user\@$host")
}
sub importer {
my $old = -e $latest;
PublicInbox::Import::init_bare($latest);
my $git = PublicInbox::Git->new($latest);
- $git->qx(qw(config core.sharedRepository 0600)) if !$old;
+ if (!$old) {
+ $git->qx(qw(config core.sharedRepository 0600));
+ $self->done; # force eidx_init on next round
+ }
my $packed_bytes = $git->packed_bytes;
my $unpacked_bytes = $packed_bytes / $self->packing_factor;
if ($unpacked_bytes >= $self->rotate_bytes) {
PublicInbox::LeiSearch->new($_[0]->{priv_eidx}->{topdir});
}
+# follows the stderr file
+sub _tail_err {
+ my ($self) = @_;
+ print { $self->{-err_wr} } readline($self->{-tmp_err});
+}
+
sub eidx_init {
my ($self) = @_;
my $eidx = $self->{priv_eidx};
+ my $tl = wantarray && $self->{-err_wr} ?
+ PublicInbox::OnDestroy->new($$, \&_tail_err, $self) :
+ undef;
$eidx->idx_init({-private => 1});
- $eidx;
+ wantarray ? ($eidx, $tl) : $eidx;
}
sub _docids_for ($$) {
my ($self, $eml) = @_;
my %docids;
+ my $eidx = $self->{priv_eidx};
my ($chash, $mids) = PublicInbox::LeiSearch::content_key($eml);
- my $eidx = eidx_init($self);
my $oidx = $eidx->{oidx};
my $im = $self->{im};
for my $mid (@$mids) {
sub set_eml_vmd {
my ($self, $eml, $vmd, $docids) = @_;
- my $eidx = eidx_init($self);
+ my ($eidx, $tl) = eidx_init($self);
$docids //= [ _docids_for($self, $eml) ];
for my $docid (@$docids) {
$eidx->idx_shard($docid)->ipc_do('set_vmd', $docid, $vmd);
sub add_eml_vmd {
my ($self, $eml, $vmd) = @_;
- my $eidx = eidx_init($self);
+ my ($eidx, $tl) = eidx_init($self);
my @docids = _docids_for($self, $eml);
for my $docid (@docids) {
$eidx->idx_shard($docid)->ipc_do('add_vmd', $docid, $vmd);
sub remove_eml_vmd {
my ($self, $eml, $vmd) = @_;
- my $eidx = eidx_init($self);
+ my ($eidx, $tl) = eidx_init($self);
my @docids = _docids_for($self, $eml);
for my $docid (@docids) {
$eidx->idx_shard($docid)->ipc_do('remove_vmd', $docid, $vmd);
\@docids;
}
+sub set_sync_info ($$$) {
+ my ($self, $oidhex, $sync_info) = @_;
+ ($self->{lms} //= do {
+ require PublicInbox::LeiMailSync;
+ my $f = "$self->{priv_eidx}->{topdir}/mail_sync.sqlite3";
+ my $lms = PublicInbox::LeiMailSync->new($f);
+ $lms->lms_begin;
+ $lms;
+ })->set_src($oidhex, @$sync_info);
+}
+
sub add_eml {
my ($self, $eml, $vmd, $xoids) = @_;
my $im = $self->importer; # may create new epoch
- my $eidx = eidx_init($self); # writes ALL.git/objects/info/alternates
+ my ($eidx, $tl) = eidx_init($self); # updates/writes alternates file
my $oidx = $eidx->{oidx}; # PublicInbox::Import::add checks this
my $smsg = bless { -oidx => $oidx }, 'PublicInbox::Smsg';
- $im->add($eml, undef, $smsg) or return; # duplicate returns undef
+ my $im_mark = $im->add($eml, undef, $smsg);
+ if ($vmd && $vmd->{sync_info}) {
+ set_sync_info($self, $smsg->{blob}, $vmd->{sync_info});
+ }
+ $im_mark or return; # duplicate blob returns undef
local $self->{current_info} = $smsg->{blob};
my $vivify_xvmd = delete($smsg->{-vivify_xvmd}) // []; # exact matches
sub update_xvmd {
my ($self, $xoids, $eml, $vmd_mod) = @_;
- my $eidx = eidx_init($self);
+ my ($eidx, $tl) = eidx_init($self);
my $oidx = $eidx->{oidx};
my %seen;
for my $oid (keys %$xoids) {
sub set_xvmd {
my ($self, $xoids, $eml, $vmd) = @_;
- my $eidx = eidx_init($self);
+ my ($eidx, $tl) = eidx_init($self);
my $oidx = $eidx->{oidx};
my %seen;
$self->{priv_eidx}->checkpoint($wait);
}
+sub xchg_stderr {
+ my ($self) = @_;
+ _tail_err($self) if $self->{-err_wr};
+ my $dir = $self->{priv_eidx}->{topdir};
+ return unless -e $dir;
+ my $old = delete $self->{-tmp_err};
+ my $pfx = POSIX::strftime('%Y%m%d%H%M%S', gmtime(time));
+ my $err = File::Temp->new(TEMPLATE => "$pfx.$$.lei_storeXXXX",
+ SUFFIX => '.err', DIR => $dir);
+ open STDERR, '>>', $err->filename or die "dup2: $!";
+ STDERR->autoflush(1); # shared with shard subprocesses
+ $self->{-tmp_err} = $err; # separate file description for RO access
+ undef;
+}
+
sub done {
my ($self) = @_;
my $err = '';
warn $err;
}
}
- $self->{priv_eidx}->done;
+ if (my $lms = delete $self->{lms}) {
+ $lms->lms_commit;
+ }
+ $self->{priv_eidx}->done; # V2Writable::done
+ xchg_stderr($self);
die $err if $err;
}
my ($self) = @_;
my $lei = $self->{lei};
$lei->_lei_atfork_child(1) if $lei;
+ xchg_stderr($self);
+ if (my $err = delete($self->{err_pipe})) {
+ close $err->[0];
+ $self->{-err_wr} = $err->[1];
+ }
+ $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
$self->SUPER::ipc_atfork_child;
}
my $d = $lei->store_path;
$self->ipc_lock_init("$d/ipc.lock");
substr($d, -length('/lei/store'), 10, '');
+ my $err_pipe;
+ unless ($lei->{oneshot}) {
+ pipe(my ($r, $w)) or die "pipe: $!";
+ $err_pipe = [ $r, $w ];
+ }
# Mail we import into lei are private, so headers filtered out
# by -mda for public mail are not appropriate
local @PublicInbox::MDA::BAD_HEADERS = ();
$self->ipc_worker_spawn("lei/store $d", $lei->oldset,
- { lei => $lei });
+ { lei => $lei, err_pipe => $err_pipe });
+ if ($err_pipe) {
+ require PublicInbox::LeiStoreErr;
+ PublicInbox::LeiStoreErr->new($err_pipe->[0], $lei);
+ }
}
$lei->{sto} = $self;
}