user/dev discussion of public-inbox itself
 help / color / Atom feed
* [PATCH] git_async_cat: unref pipes on EOF from git->cleanup
@ 2020-07-05 22:50 Eric Wong
  2020-07-06  6:11 ` [PATCH v2] " Eric Wong
  0 siblings, 1 reply; 3+ messages in thread
From: Eric Wong @ 2020-07-05 22:50 UTC (permalink / raw)
  To: meta

We avoided a managed circular reference in 10ee3548084c125f
but introduced a pipe FD leak, instead.  So handle the EOF
we get when the "git cat-file --batch" process exits and
closes its stdout FD.

Fixes: 10ee3548084c125f ("git_async_cat: remove circular reference")
---
 lib/PublicInbox/GitAsyncCat.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index 0b777204a..1bbbe8c58 100644
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -24,7 +24,8 @@ sub _add {
 
 sub event_step {
 	my ($self) = @_;
-	my $git = $self->{git} or return; # ->close-ed
+	my $git = $self->{git};
+	return $self->close if ($git->{in} // 0) != $self->{sock};
 	my $inflight = $git->{inflight};
 	if ($inflight && @$inflight) {
 		$git->cat_async_step($inflight);
@@ -34,7 +35,7 @@ sub event_step {
 
 sub close {
 	my ($self) = @_;
-	if (my $git = delete $self->{git}) {
+	if (my $git = $self->{git}) {
 		delete $git->{async_cat};
 	}
 	$self->SUPER::close; # PublicInbox::DS::close

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH v2] git_async_cat: unref pipes on EOF from git->cleanup
  2020-07-05 22:50 [PATCH] git_async_cat: unref pipes on EOF from git->cleanup Eric Wong
@ 2020-07-06  6:11 ` Eric Wong
  2020-07-06 19:48   ` Eric Wong
  0 siblings, 1 reply; 3+ messages in thread
From: Eric Wong @ 2020-07-06  6:11 UTC (permalink / raw)
  To: meta

We avoided a managed circular reference in 10ee3548084c125f
but introduced a pipe FD leak, instead.  So handle the EOF
we get when the "git cat-file --batch" process exits and
closes its stdout FD.

v2: remove ->close entirely.  PublicInbox::Git->cleanup
handles all cleanup.  This prevents us from inadvertantly
deleting the {async_cat} field associated with a different
pipe than the one GAC is monitoring.

Fixes: 10ee3548084c125f ("git_async_cat: remove circular reference")
---
 lib/PublicInbox/GitAsyncCat.pm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index 0b777204a..e79f416db 100644
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -24,7 +24,8 @@ sub _add {
 
 sub event_step {
 	my ($self) = @_;
-	my $git = $self->{git} or return; # ->close-ed
+	my $git = $self->{git};
+	return $self->close if ($git->{in} // 0) != $self->{sock};
 	my $inflight = $git->{inflight};
 	if ($inflight && @$inflight) {
 		$git->cat_async_step($inflight);
@@ -32,14 +33,6 @@ sub event_step {
 	}
 }
 
-sub close {
-	my ($self) = @_;
-	if (my $git = delete $self->{git}) {
-		delete $git->{async_cat};
-	}
-	$self->SUPER::close; # PublicInbox::DS::close
-}
-
 sub git_async_cat ($$$$) {
 	my ($git, $oid, $cb, $arg) = @_;
 	$git->cat_async($oid, $cb, $arg);

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] git_async_cat: unref pipes on EOF from git->cleanup
  2020-07-06  6:11 ` [PATCH v2] " Eric Wong
@ 2020-07-06 19:48   ` Eric Wong
  0 siblings, 0 replies; 3+ messages in thread
From: Eric Wong @ 2020-07-06 19:48 UTC (permalink / raw)
  To: meta

Will also squash this in because ->requeue could cause us to
reenter event_step after ->close.

diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index e79f416d..e618d366 100644
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -25,10 +25,10 @@ sub _add {
 sub event_step {
 	my ($self) = @_;
 	my $git = $self->{git};
-	return $self->close if ($git->{in} // 0) != $self->{sock};
+	return $self->close if ($git->{in} // 0) != ($self->{sock} // 1);
 	my $inflight = $git->{inflight};
 	if ($inflight && @$inflight) {
 		$git->cat_async_step($inflight);
 		$self->requeue if @$inflight || exists $git->{cat_rbuf};
 	}
 }

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-05 22:50 [PATCH] git_async_cat: unref pipes on EOF from git->cleanup Eric Wong
2020-07-06  6:11 ` [PATCH v2] " Eric Wong
2020-07-06 19:48   ` Eric Wong

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror https://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git