lei export-kw: do not write directly to mail_sync.sqlite3

Only the lei/store process should be writing to files/DBs
in lei/store.

diff --git a/lib/PublicInbox/LeiExportKw.pm b/lib/PublicInbox/LeiExportKw.pm
index 92c3aa43e7e83b4524c0d477d8385bc9b51da4b7..b31b065fe4f95fb062650a7218dc048a8f21c122 100644 (file)
--- a/lib/PublicInbox/LeiExportKw.pm
+++ b/lib/PublicInbox/LeiExportKw.pm
@@ -28,6 +28,7 @@ sub export_kw_md { # LeiMailSync->each_src callback
                PublicInbox::LeiToMail::kw2suffix([keys %$sto_kw], @$unknown);
        my $dst = "$mdir/cur/$bn";
        my @fail;
+       my $lei = $self->{lei};
        for my $d (@try) {
                my $src = "$mdir/$d/$$id";
                next if $src eq $dst;
@@ -39,15 +40,15 @@ sub export_kw_md { # LeiMailSync->each_src callback
                        # unlink(2) may ENOENT from parallel invocation,
                        # ignore it, but not other serious errors
                        if (!unlink($src) and $! != ENOENT) {
-                               $self->{lei}->child_error(1,
-                                                       "E: unlink($src): $!");
+                               $lei->child_error(1, "E: unlink($src): $!");
                        }
-                       $self->{lms}->mv_src("maildir:$mdir",
-                                               $oidbin, $id, $bn) or die;
+                       $lei->{sto}->ipc_do('lms_mv_src', "maildir:$mdir",
+                                               $oidbin, $id, $bn);
                        return; # success anyways if link(2) worked
                }
                if ($! == ENOENT && !-e $src) { # some other process moved it
-                       $self->{lms}->clear_src("maildir:$mdir", $id);
+                       $lei->{sto}->ipc_do('lms_clear_src',
+                                               "maildir:$mdir", $id);
                        next;
                }
                push @fail, $src if $! != EEXIST;
@@ -56,7 +57,7 @@ sub export_kw_md { # LeiMailSync->each_src callback
        # both tries failed
        my $e = $!;
        my $orig = '['.join('|', @fail).']';
-       $self->{lei}->child_error(1, "link($orig, $dst) ($oidhex): $e");
+       $lei->child_error(1, "link($orig, $dst) ($oidhex): $e");
 }
 
 sub export_kw_imap { # LeiMailSync->each_src callback
@@ -69,8 +70,7 @@ sub export_kw_imap { # LeiMailSync->each_src callback
 # overrides PublicInbox::LeiInput::input_path_url
 sub input_path_url {
        my ($self, $input, @args) = @_;
-       my $lms = $self->{lms} //= $self->{lse}->lms;
-       $lms->lms_begin;
+       my $lms = $self->{-lms_ro} //= $self->{lse}->lms;
        if ($input =~ /\Amaildir:(.+)/i) {
                my $mdir = $1;
                require PublicInbox::LeiToMail; # kw2suffix
@@ -81,7 +81,7 @@ sub input_path_url {
                $lms->each_src($$uri, \&export_kw_imap, $self, $mic);
                $mic->expunge;
        } else { die "BUG: $input not supported" }
-       $lms->lms_commit;
+       my $wait = $self->{lei}->{sto}->ipc_do('done');
 }
 
 sub lei_export_kw {
@@ -151,8 +151,9 @@ EOM
                $self->{imap_mod_kw} = $net->can($self->{-merge_kw} ?
                                        'imap_add_kw' : 'imap_set_kw');
        }
-       undef $lms;
+       undef $lms; # for fork
        my $ops = {};
+       $sto->write_prepare($lei);
        $lei->{auth}->op_merge($ops, $self) if $lei->{auth};
        $self->{-wq_nr_workers} = $j // 1; # locked
        (my $op_c, $ops) = $lei->workers_start($self, $j, $ops);

diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 6888afb40d3568a9003e9ccf51d4e5d171d5aeaa..821782b9a4135c3e352979ed590e618e047da490 100644 (file)
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -193,15 +193,30 @@ sub remove_eml_vmd { # remove just the VMD
        \@docids;
 }
 
-sub set_sync_info {
-       my ($self, $oidhex, $folder, $id) = @_;
-       ($self->{lms} //= do {
+sub _lms_rw ($) {
+       my ($self) = @_;
+       $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, $folder, $id);
+       };
+}
+
+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 set_sync_info {
+       my ($self, $oidhex, $folder, $id) = @_;
+       _lms_rw($self)->set_src($oidhex, $folder, $id);
 }
 
 sub _remove_if_local { # git->cat_async arg