about summary refs log tree commit homepage
path: root/lib/PublicInbox/InboxWritable.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-11-14 01:12:11 +0000
committerEric Wong <e@80x24.org>2019-11-14 06:43:18 +0000
commit6466b21e0776fdd88648730e7248d6887d380224 (patch)
treea0cad403b0fbae219906ec04886ae7f938684c93 /lib/PublicInbox/InboxWritable.pm
parent45fb16664775746dc4b3f7a55743dbe622a3c5ae (diff)
downloadpublic-inbox-6466b21e0776fdd88648730e7248d6887d380224.tar.gz
InboxWritable caching the result of ->importer leads to a
circular references with returned (V2Writable|Import) object
holds onto the calling InboxWritable object.

With public-inbox-watch, this leads to a memory leak if a user
is reloading via SIGHUP after a message is imported (it would
only become noticeable with SIGHUPs after every message imported).

I would not expect anybody to to notice this in real-world
usage.  I only noticed this since I was making -xcpdb suitable
for long-lived process use (e.g. "mod_perl style") and a flock
remained unreleased on v1 inboxes after resharding.

WatchMaildir (used by -watch) already handles caching of the
importer object itself, and all of our other real-world uses of
->importer are short-lived or designed for batch scripts, so
there's no need to cache the importer result internally.
Diffstat (limited to 'lib/PublicInbox/InboxWritable.pm')
-rw-r--r--lib/PublicInbox/InboxWritable.pm30
1 files changed, 14 insertions, 16 deletions
diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index 9eab394d..c73910ac 100644
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -52,22 +52,20 @@ sub init_inbox {
 
 sub importer {
         my ($self, $parallel) = @_;
-        $self->{-importer} ||= do {
-                my $v = $self->{version} || 1;
-                if ($v == 2) {
-                        eval { require PublicInbox::V2Writable };
-                        die "v2 not supported: $@\n" if $@;
-                        my $opt = $self->{-creat_opt};
-                        my $v2w = PublicInbox::V2Writable->new($self, $opt);
-                        $v2w->{parallel} = $parallel;
-                        $v2w;
-                } elsif ($v == 1) {
-                        my @arg = (undef, undef, undef, $self);
-                        PublicInbox::Import->new(@arg);
-                } else {
-                        $! = 78; # EX_CONFIG 5.3.5 local configuration error
-                        die "unsupported inbox version: $v\n";
-                }
+        my $v = $self->{version} || 1;
+        if ($v == 2) {
+                eval { require PublicInbox::V2Writable };
+                die "v2 not supported: $@\n" if $@;
+                my $opt = $self->{-creat_opt};
+                my $v2w = PublicInbox::V2Writable->new($self, $opt);
+                $v2w->{parallel} = $parallel;
+                $v2w;
+        } elsif ($v == 1) {
+                my @arg = (undef, undef, undef, $self);
+                PublicInbox::Import->new(@arg);
+        } else {
+                $! = 78; # EX_CONFIG 5.3.5 local configuration error
+                die "unsupported inbox version: $v\n";
         }
 }