* [PATCH 01/10] lei_auth: rename {nrd} field to {net} for clarity
2021-02-22 11:21 6% [PATCH 00/10] lei: avoid wasting IMAP connections Eric Wong
@ 2021-02-22 11:22 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-02-22 11:22 UTC (permalink / raw)
To: meta
We're authing for both reads and writes, this makes it
clear that we support both NetReader and NetWriter.
---
lib/PublicInbox/LeiAuth.pm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm
index bf0110ed..c70d8e8f 100644
--- a/lib/PublicInbox/LeiAuth.pm
+++ b/lib/PublicInbox/LeiAuth.pm
@@ -10,22 +10,22 @@ use parent qw(PublicInbox::IPC);
use PublicInbox::PktOp qw(pkt_do);
use PublicInbox::NetReader;
-sub nrd_merge {
- my ($lei, $nrd_new) = @_;
+sub net_merge {
+ my ($lei, $net_new) = @_;
if ($lei->{pkt_op_p}) { # from lei_convert worker
- pkt_do($lei->{pkt_op_p}, 'nrd_merge', $nrd_new);
+ pkt_do($lei->{pkt_op_p}, 'net_merge', $net_new);
} else { # single lei-daemon consumer
my $self = $lei->{auth} or return; # client disconnected
- my $nrd = $self->{nrd};
- %$nrd = (%$nrd, %$nrd_new);
+ my $net = $self->{net};
+ %$net = (%$net, %$net_new);
}
}
sub do_auth { # called via wq_io_do
my ($self) = @_;
- my ($lei, $nrd) = @$self{qw(lei nrd)};
- $nrd->imap_common_init($lei);
- nrd_merge($lei, $nrd); # tell lei-daemon updated auth info
+ my ($lei, $net) = @$self{qw(lei net)};
+ $net->imap_common_init($lei);
+ net_merge($lei, $net); # tell lei-daemon updated auth info
}
sub do_finish_auth { # dwaitpid callback
@@ -44,7 +44,7 @@ sub auth_start {
my ($self, $lei, $post_auth_cb, @args) = @_;
$lei->_lei_cfg(1); # workers may need to read config
my $op = $lei->workers_start($self, 'auth', 1, {
- 'nrd_merge' => [ \&nrd_merge, $lei ],
+ 'net_merge' => [ \&net_merge, $lei ],
'' => [ \&auth_eof, $lei, $post_auth_cb, @args ],
});
$self->wq_io_do('do_auth', []);
@@ -63,8 +63,8 @@ sub ipc_atfork_child {
}
sub new {
- my ($cls, $nrd) = @_; # nrd may be NetReader or descendant (NetWriter)
- bless { nrd => $nrd }, $cls;
+ my ($cls, $net) = @_; # net may be NetReader or descendant (NetWriter)
+ bless { net => $net }, $cls;
}
1;
^ permalink raw reply related [relevance 7%]
* [PATCH 00/10] lei: avoid wasting IMAP connections
@ 2021-02-22 11:21 6% Eric Wong
2021-02-22 11:22 7% ` [PATCH 01/10] lei_auth: rename {nrd} field to {net} for clarity Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-02-22 11:21 UTC (permalink / raw)
To: meta
This makes the code a bit less straightforward, unfortunately;
but I've tried to comment it a bit and add some flow notes.
The payoff is it saves IMAP connection setup costs which is
noticeable in high-latency and/or metered bandwidth situations.
LeiAuth is signficantly rewritten so it uses lei-daemon
to route credentials from the first worker to other workers.
Eric Wong (10):
lei_auth: rename {nrd} field to {net} for clarity
lei: keep client {sock} in short-lived workers
lei: _lei_cfg: return empty hashref if unconfigured
lei convert: auth directly from worker process
lei import: no separate auth worker
lei_auth: migrate common auth code from lei_import
lei q: reduce wasted IMAP connection for auth
net_reader: mic_get: reuse connections if cache enabled
lei convert: inline convert_start
lei_auth: trim and remove leftover worker code
lib/PublicInbox/LEI.pm | 8 ++--
lib/PublicInbox/LeiAuth.pm | 76 +++++++++++++---------------------
lib/PublicInbox/LeiConvert.pm | 36 +++++++---------
lib/PublicInbox/LeiExternal.pm | 6 +--
lib/PublicInbox/LeiImport.pm | 60 ++++++++++++++++-----------
lib/PublicInbox/LeiQuery.pm | 9 ++--
lib/PublicInbox/LeiToMail.pm | 53 ++++++++++++++++--------
lib/PublicInbox/LeiXSearch.pm | 26 ++++++++----
lib/PublicInbox/NetReader.pm | 20 +++++----
lib/PublicInbox/NetWriter.pm | 2 +-
10 files changed, 158 insertions(+), 138 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-02-22 11:21 6% [PATCH 00/10] lei: avoid wasting IMAP connections Eric Wong
2021-02-22 11:22 7% ` [PATCH 01/10] lei_auth: rename {nrd} field to {net} for clarity 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).