From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 05/10] lei import: no separate auth worker
Date: Mon, 22 Feb 2021 08:22:54 -0300 [thread overview]
Message-ID: <20210222112259.32402-5-e@80x24.org> (raw)
In-Reply-To: <20210222112259.32402-1-e@80x24.org>
We'll start sharing auth info from the first worker to the
rest of the workers via wq_broadcast.
This lays the groundwork for getting rid of LeiAuth workers for
authentication work and reducing network round trips required
for IMAP.
---
lib/PublicInbox/LeiImport.pm | 87 ++++++++++++++++++++++++++----------
1 file changed, 63 insertions(+), 24 deletions(-)
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 68cab12c..5e2e61af 100644
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -8,6 +8,7 @@ use v5.10.1;
use parent qw(PublicInbox::IPC);
use PublicInbox::Eml;
use PublicInbox::InboxWritable qw(eml_from_path);
+use PublicInbox::PktOp qw(pkt_do);
sub _import_eml { # MboxReader callback
my ($eml, $sto, $set_kw) = @_;
@@ -28,24 +29,54 @@ sub import_done { # EOF callback for main daemon
$imp->wq_wait_old(\&import_done_wait, $lei);
}
+sub net_merge_all { # via wq_broadcast
+ my ($self, $net_new) = @_;
+ my $net = $self->{lei}->{net};
+ %$net = (%$net, %$net_new);
+ pkt_do($self->{lei}->{pkt_op_p}, 'net_merge_done1') or
+ die "pkt_op_do net_merge_done1: $!";
+}
+
+sub net_merge_continue { # first worker is done with auth
+ my ($self, $net_new) = @_;
+ $self->wq_broadcast('net_merge_all', $net_new);
+}
+
+sub net_merge_complete {
+ my ($self) = @_;
+ for my $input (@{$self->{inputs}}) {
+ $self->wq_io_do('import_path_url', [], $input);
+ }
+ $self->wq_close(1);
+}
+
+sub net_merge_done1 {
+ my ($self) = @_;
+ my $lei = $self->{lei};
+ return if ++$lei->{nr_net_merge_done} != $self->{-wq_nr_workers};
+ net_merge_complete($self);
+}
+
sub import_start {
my ($lei) = @_;
my $self = $lei->{imp};
my $j = $lei->{opt}->{jobs} // scalar(@{$self->{inputs}}) || 1;
- if (my $nrd = $lei->{nrd}) {
- # $j = $nrd->net_concurrency($j); TODO
+ if (my $net = $lei->{net}) {
+ # $j = $net->net_concurrency($j); TODO
} else {
my $nproc = $self->detect_nproc;
$j = $nproc if $j > $nproc;
}
- my $op = $lei->workers_start($self, 'lei_import', $j, {
- '' => [ \&import_done, $lei ],
- });
- $self->wq_io_do('import_stdin', []) if $self->{0};
- for my $input (@{$self->{inputs}}) {
- $self->wq_io_do('import_path_url', [], $input);
+ my $ops = { '' => [ \&import_done, $lei ] };
+ my $auth = $lei->{auth};
+ if ($auth) {
+ $ops->{net_merge} = [ \&net_merge_continue, $self ];
+ $ops->{net_merge_done1} = [ \&net_merge_done1, $self ];
}
- $self->wq_close(1);
+ $self->{-wq_nr_workers} = $j // 1; # locked
+ my $op = $lei->workers_start($self, 'lei_import', undef, $ops);
+ $self->wq_io_do('import_stdin', []) if $self->{0};
+ net_merge_complete($self) if !$auth;
while ($op && $op->{sock}) { $op->event_step }
}
@@ -53,7 +84,7 @@ sub call { # the main "lei import" method
my ($cls, $lei, @inputs) = @_;
my $sto = $lei->_lei_store(1);
$sto->write_prepare($lei);
- my ($nrd, @f, @d);
+ my ($net, @f, @d);
$lei->{opt}->{kw} //= 1;
my $self = $lei->{imp} = bless { inputs => \@inputs }, $cls;
if ($lei->{opt}->{stdin}) {
@@ -69,8 +100,8 @@ sub call { # the main "lei import" method
my $input_path = $input;
if ($input =~ m!\A(?:imap|nntp)s?://!i) {
require PublicInbox::NetReader;
- $nrd //= PublicInbox::NetReader->new;
- $nrd->add_url($input);
+ $net //= PublicInbox::NetReader->new;
+ $net->add_url($input);
} elsif ($input_path =~ s/\A([a-z0-9]+)://is) {
my $ifmt = lc $1;
if (($fmt // $ifmt) ne $ifmt) {
@@ -98,23 +129,31 @@ sub call { # the main "lei import" method
require PublicInbox::MdirReader;
}
$self->{inputs} = \@inputs;
- return import_start($lei) if !$nrd;
-
- if (my $err = $nrd->errors) {
- return $lei->fail($err);
+ if ($net) {
+ if (my $err = $net->errors) {
+ return $lei->fail($err);
+ }
+ $net->{quiet} = $lei->{opt}->{quiet};
+ $lei->{net} = $net;
+ require PublicInbox::LeiAuth;
+ $lei->{auth} = PublicInbox::LeiAuth->new($net);
}
- $nrd->{quiet} = $lei->{opt}->{quiet};
- $lei->{nrd} = $nrd;
- require PublicInbox::LeiAuth;
- my $auth = $lei->{auth} = PublicInbox::LeiAuth->new($nrd);
- $auth->auth_start($lei, \&import_start, $lei);
+ import_start($lei);
}
sub ipc_atfork_child {
my ($self) = @_;
- delete $self->{lei}->{imp}; # drop circular ref
- $self->{lei}->lei_atfork_child;
+ my $lei = $self->{lei};
+ delete $lei->{imp}; # drop circular ref
+ $lei->lei_atfork_child;
$self->SUPER::ipc_atfork_child;
+ my $net = $lei->{net};
+ if ($net && $self->{-wq_worker_nr} == 0) {
+ my $mics = $net->imap_common_init($lei);
+ PublicInbox::LeiAuth::net_merge($lei, $net);
+ $net->{mics_cached} = $mics;
+ }
+ undef;
}
sub _import_fh {
@@ -154,7 +193,7 @@ sub import_path_url {
my $ifmt = lc($lei->{opt}->{'format'} // '');
# TODO auto-detect?
if ($input =~ m!\A(imap|nntp)s?://!i) {
- $lei->{nrd}->imap_each($input, \&_import_imap, $lei->{sto},
+ $lei->{net}->imap_each($input, \&_import_imap, $lei->{sto},
$lei->{opt}->{kw});
return;
} elsif ($input =~ s!\A([a-z0-9]+):!!i) {
next prev parent reply other threads:[~2021-02-22 11:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-22 11:21 [PATCH 00/10] lei: avoid wasting IMAP connections Eric Wong
2021-02-22 11:22 ` [PATCH 01/10] lei_auth: rename {nrd} field to {net} for clarity Eric Wong
2021-02-22 11:22 ` [PATCH 02/10] lei: keep client {sock} in short-lived workers Eric Wong
2021-02-22 11:22 ` [PATCH 03/10] lei: _lei_cfg: return empty hashref if unconfigured Eric Wong
2021-02-22 11:22 ` [PATCH 04/10] lei convert: auth directly from worker process Eric Wong
2021-02-22 11:22 ` Eric Wong [this message]
2021-02-22 11:22 ` [PATCH 06/10] lei_auth: migrate common auth code from lei_import Eric Wong
2021-02-22 11:22 ` [PATCH 07/10] lei q: reduce wasted IMAP connection for auth Eric Wong
2021-02-22 11:22 ` [PATCH 08/10] net_reader: mic_get: reuse connections if cache enabled Eric Wong
2021-02-22 11:22 ` [PATCH 09/10] lei convert: inline convert_start Eric Wong
2021-02-22 11:22 ` [PATCH 10/10] lei_auth: trim and remove leftover worker code Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210222112259.32402-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).