diff options
author | Eric Wong <e@80x24.org> | 2019-06-01 00:20:51 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-06-01 07:38:49 +0000 |
commit | e48187f2ca08612e1eb1f987caa9cd5be48be27a (patch) | |
tree | 6f30fc670250f3cad35a7cac3fa2bc94652d08e4 /lib/PublicInbox | |
parent | 2c5ef3910834b1a931bc83d294181dc6baddddd3 (diff) | |
download | public-inbox-e48187f2ca08612e1eb1f987caa9cd5be48be27a.tar.gz |
A constant stream of traffic to either httpd/nntpd would mean git-cat-file processes never expire. Things can go bad after a full repack, as a full repack will unlink old pack indices and git-cat-file does not currently detect unlinked files. We could do something complicated by recursively stat-ing objects/pack of every git directory and alternate; but that's probably not worth the trouble compared to occasionally restarting the cat-file process. So simplify the code and let httpd/nntpd expire them periodically, since spawning a "git-cat-file --batch" process isn't too expensive. We already spawn for every request which hits git-http-backend, cgit, and git-apply. In the future, we may optionally support the Git::Raw module to avoid IPC; but we must remain careful to not leave lingering FDs open to unlinked files after repack.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/Git.pm | 20 | ||||
-rw-r--r-- | lib/PublicInbox/Inbox.pm | 5 |
2 files changed, 7 insertions, 18 deletions
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index a4daaa48..9a38d7c8 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -211,19 +211,9 @@ sub check { } sub _destroy { - my ($self, $in, $out, $pid, $expire) = @_; - my $rfh = $self->{$in} or return; - if (defined $expire) { - # at least FreeBSD 11.2 and Linux 4.20 update mtime of the - # read end of a pipe when the pipe is written to; dunno - # about other OSes. - my $mtime = (stat($rfh))[9]; - return if $mtime > $expire; - } + my ($self, $in, $out, $pid) = @_; my $p = delete $self->{$pid} or return; - foreach my $f ($in, $out) { - delete $self->{$f}; - } + delete @$self{($in, $out)}; waitpid $p, 0; } @@ -251,9 +241,9 @@ sub qx { # returns true if there are pending "git cat-file" processes sub cleanup { - my ($self, $expire) = @_; - _destroy($self, qw(in out pid), $expire); - _destroy($self, qw(in_c out_c pid_c), $expire); + my ($self) = @_; + _destroy($self, qw(in out pid)); + _destroy($self, qw(in_c out_c pid_c)); !!($self->{pid} || $self->{pid_c}); } diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index 2771a241..b3178b98 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -32,13 +32,12 @@ sub cleanup_task () { # refcnt is zero when tmp is out-of-scope } } - my $expire = time - 60; if (my $git = $ibx->{git}) { - $again = $git->cleanup($expire); + $again = $git->cleanup; } if (my $gits = $ibx->{-repo_objs}) { foreach my $git (@$gits) { - $again = 1 if $git->cleanup($expire); + $again = 1 if $git->cleanup; } } if ($have_devel_peek) { |