From b2c5c71a014b6acc897b12c75ae9fc13476a5b3f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 8 Oct 2021 10:20:03 +0000 Subject: git: async_abort includes --batch-check requests We need to abort both check-only and cat requests when aborting, since we'll be aborting more aggressively in in read-write paths. --- lib/PublicInbox/GitAsyncCat.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/PublicInbox/GitAsyncCat.pm') diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm index 57c194d9..cea3f539 100644 --- a/lib/PublicInbox/GitAsyncCat.pm +++ b/lib/PublicInbox/GitAsyncCat.pm @@ -16,7 +16,7 @@ our $GCF2C; # singleton PublicInbox::Gcf2Client sub close { my ($self) = @_; if (my $git = delete $self->{git}) { - $git->cat_async_abort; + $git->async_abort; } $self->SUPER::close; # PublicInbox::DS::close } @@ -32,7 +32,7 @@ sub event_step { # child death? if (($git->{in} // 0) != ($self->{sock} // 1)) { $self->close; - } elsif (@$inflight || exists $git->{cat_rbuf}) { + } elsif (@$inflight || exists $git->{rbuf}) { # ok, more to do, requeue for fairness $self->requeue; } -- cgit v1.2.3-24-ge0c7