lei_mail_sync: rely on flock(2), avoid IPC

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

diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index a91b30f749520b9ad2eab309d00e168d79fba863..08add8f5a05496ab234f5cfad9737903de0c009a 100644 (file)
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -20,14 +20,13 @@ use PublicInbox::Eml;
 use PublicInbox::Import;
 use PublicInbox::InboxWritable qw(eml_from_path);
 use PublicInbox::V2Writable;
-use PublicInbox::ContentHash qw(content_hash git_sha);
+use PublicInbox::ContentHash qw(content_hash);
 use PublicInbox::MID qw(mids);
 use PublicInbox::LeiSearch;
 use PublicInbox::MDA;
 use PublicInbox::Spawn qw(spawn);
 use PublicInbox::MdirReader;
 use PublicInbox::LeiToMail;
-use List::Util qw(max);
 use File::Temp ();
 use POSIX ();
 use IO::Handle (); # ->autoflush
@@ -50,19 +49,6 @@ sub rotate_bytes {
        $_[0]->{rotate_bytes} // ((1024 * 1024 * 1024) / $_[0]->packing_factor)
 }
 
-sub git_pfx { "$_[0]->{priv_eidx}->{topdir}/local" };
-
-sub git_epoch_max  {
-       my ($self) = @_;
-       if (opendir(my $dh, $self->git_pfx)) {
-               max(map {
-                       substr($_, 0, -4) + 0; # drop ".git" suffix
-               } grep(/\A[0-9]+\.git\z/, readdir($dh))) // 0;
-       } else {
-               $!{ENOENT} ? 0 : die("opendir ${\$self->git_pfx}: $!\n");
-       }
-}
-
 sub git_ident ($) {
        my ($git) = @_;
        my $rdr = {};
@@ -91,22 +77,16 @@ sub importer {
                $im->done;
                undef $im;
                $self->checkpoint;
-               $max = $self->git_epoch_max + 1;
+               $max = $self->{priv_eidx}->{mg}->git_epochs + 1;
        }
        my (undef, $tl) = eidx_init($self); # acquire lock
-       my $pfx = $self->git_pfx;
-       $max //= $self->git_epoch_max;
+       $max //= $self->{priv_eidx}->{mg}->git_epochs;
        while (1) {
-               my $latest = "$pfx/$max.git";
-               my $old = -e $latest;
-               PublicInbox::Import::init_bare($latest);
+               my $latest = $self->{priv_eidx}->{mg}->add_epoch($max);
                my $git = PublicInbox::Git->new($latest);
-               if (!$old) {
-                       $git->qx(qw(config core.sharedRepository 0600));
-                       $self->done; # unlock
-                       # re-acquire lock, update alternates for new epoch
-                       (undef, $tl) = eidx_init($self);
-               }
+               $self->done; # unlock
+               # re-acquire lock, update alternates for new epoch
+               (undef, $tl) = eidx_init($self);
                my $packed_bytes = $git->packed_bytes;
                my $unpacked_bytes = $packed_bytes / $self->packing_factor;
                if ($unpacked_bytes >= $self->rotate_bytes) {
@@ -210,21 +190,17 @@ sub export1_kw_md ($$$$$) {
                                syslog('warning', "unlink($src): $!");
                        }
                        # TODO: verify oidbin?
-                       lms_mv_src($self, "maildir:$mdir",
+                       $self->{lms}->mv_src("maildir:$mdir",
                                        $oidbin, \$orig, $bn);
                        return;
                } elsif ($! == EEXIST) { # lost race with "lei export-kw"?
                        return;
-               } elsif ($! == ENOENT) {
-                       syslog('warning', "link($src -> $dst): $!")
-               } # else loop @try
+               } elsif ($! != ENOENT) {
+                       syslog('warning', "link($src -> $dst): $!");
+               }
        }
-       my $e = $!;
-       my $src = "$mdir/{".join(',', @try)."}/$orig";
-       my $oidhex = unpack('H*', $oidbin);
-       syslog('warning', "link($src -> $dst) ($oidhex): $e");
        for (@try) { return if -e "$mdir/$_/$orig" };
-       lms_clear_src($self, "maildir:$mdir", \$orig);
+       $self->{lms}->clear_src("maildir:$mdir", \$orig);
 }
 
 sub sto_export_kw ($$$) {
@@ -279,7 +255,7 @@ sub remove_eml_vmd { # remove just the VMD
        \@docids;
 }
 
-sub _lms_rw ($) {
+sub _lms_rw ($) { # it is important to have eidx processes open before lms
        my ($self) = @_;
        my ($eidx, $tl) = eidx_init($self);
        $self->{lms} //= do {
@@ -291,27 +267,6 @@ sub _lms_rw ($) {
        };
 }
 
-sub lms_clear_src {
-       my ($self, $folder, $id) = @_;
-       _lms_rw($self)->clear_src($folder, $id);
-}
-
-sub lms_mv_src {
-       my ($self, $folder, $oidbin, $id, $newbn) = @_;
-       _lms_rw($self)->mv_src($folder, $oidbin, $id, $newbn);
-}
-
-sub lms_forget_folders {
-       my ($self, @folders) = @_;
-       my $lms = _lms_rw($self);
-       for my $f (@folders) { $lms->forget_folder($f) }
-}
-
-sub lms_rename_folder {
-       my ($self, $old, $new) = @_;
-       _lms_rw($self)->rename_folder($old, $new);
-}
-
 sub set_sync_info {
        my ($self, $oidhex, $folder, $id) = @_;
        _lms_rw($self)->set_src(pack('H*', $oidhex), $folder, $id);
@@ -627,18 +582,4 @@ sub write_prepare {
        $lei->{sto} = $self;
 }
 
-# TODO: support SHA-256
-sub git_blob_id { # called via LEI->git_blob_id
-       my ($self, $eml) = @_;
-       $eml->header_set($_) for @PublicInbox::Import::UNWANTED_HEADERS;
-       git_sha(1, $eml)->hexdigest;
-}
-
-# called by lei-daemon before lei->refresh_watches
-sub add_sync_folders {
-       my ($self, @folders) = @_;
-       my $lms = _lms_rw($self);
-       for my $f (@folders) { $lms->fid_for($f, 1) }
-}
-
 1;