* [PATCH 3/3] lei forget-mail-sync: rely on lei/store process
@ 2021-08-17 8:52 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-08-17 8:52 UTC (permalink / raw)
To: meta
As implied in commit 6ff03ba2be9247f1
("lei export-kw: do not write directly to mail_sync.sqlite3"),
modifying mail_sync.sqlite3 directly can lead to conflicts
and making everything go through lei/store is easier.
---
lib/PublicInbox/LeiForgetMailSync.pm | 8 ++++----
lib/PublicInbox/LeiStore.pm | 6 ++++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/LeiForgetMailSync.pm b/lib/PublicInbox/LeiForgetMailSync.pm
index c74ba25d..940ca1b6 100644
--- a/lib/PublicInbox/LeiForgetMailSync.pm
+++ b/lib/PublicInbox/LeiForgetMailSync.pm
@@ -15,13 +15,13 @@ use PublicInbox::LeiExportKw;
sub lei_forget_mail_sync {
my ($lei, @folders) = @_;
my $lms = $lei->lms or return;
+ my $sto = $lei->_lei_store or return; # may disappear due to race
+ $sto->write_prepare;
my $err = $lms->arg2folder($lei, \@folders);
$lei->qerr(@{$err->{qerr}}) if $err->{qerr};
return $lei->fail($err->{fail}) if $err->{fail};
- delete $lms->{dbh};
- $lms->lms_begin;
- $lms->forget_folder($_) for @folders;
- $lms->lms_commit;
+ $sto->ipc_do('lms_forget_folders', @folders);
+ my $wait = $sto->ipc_do('done');
}
*_complete_forget_mail_sync = \&PublicInbox::LeiExportKw::_complete_export_kw;
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 3f33d114..e8334187 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -216,6 +216,12 @@ sub lms_mv_src {
_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 set_sync_info {
my ($self, $oidhex, $folder, $id) = @_;
_lms_rw($self)->set_src($oidhex, $folder, $id);
^ permalink raw reply related [relevance 6%]
* [PATCH] lei export-kw: do not write directly to mail_sync.sqlite3
@ 2021-06-02 10:03 7% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-06-02 10:03 UTC (permalink / raw)
To: meta
Only the lei/store process should be writing to files/DBs
in lei/store.
---
lib/PublicInbox/LeiExportKw.pm | 21 +++++++++++----------
lib/PublicInbox/LeiStore.pm | 23 +++++++++++++++++++----
2 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/lib/PublicInbox/LeiExportKw.pm b/lib/PublicInbox/LeiExportKw.pm
index 92c3aa43..b31b065f 100644
--- 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 6888afb4..821782b9 100644
--- 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
^ permalink raw reply related [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-06-02 10:03 7% [PATCH] lei export-kw: do not write directly to mail_sync.sqlite3 Eric Wong
2021-08-17 8:52 [PATCH 0/3] lei: some mail sync stuff Eric Wong
2021-08-17 8:52 6% ` [PATCH 3/3] lei forget-mail-sync: rely on lei/store process Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).