From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id D66421FA01 for ; Thu, 14 Oct 2021 13:16:09 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/7] git: ->fail invokes current callback Date: Thu, 14 Oct 2021 13:16:05 +0000 Message-Id: <20211014131609.829-4-e@80x24.org> In-Reply-To: <20211014131609.829-1-e@80x24.org> References: <20211014131609.829-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: While we try to invoke all pending callbacks to force error handling, the current callback wasn't getting invoked on invoked on async_abort if my_read/my_readline failed. --- lib/PublicInbox/Git.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index 016dd2ae30e9..37342d7d10a4 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -179,8 +179,8 @@ sub my_readline ($$) { } } -sub cat_async_retry ($$$$$) { - my ($self, $inflight, $req, $cb, $arg) = @_; +sub cat_async_retry ($$) { + my ($self, $inflight) = @_; # {inflight} may be non-existent, but if it isn't we delete it # here to prevent cleanup() from waiting: @@ -189,12 +189,13 @@ sub cat_async_retry ($$$$$) { $self->{inflight} = $inflight; batch_prepare($self); - my $buf = "$req\n"; + my $buf = ''; for (my $i = 0; $i < @$inflight; $i += 3) { $buf .= "$inflight->[$i]\n"; } print { $self->{out} } $buf or $self->fail("write error: $!"); - unshift(@$inflight, \$req, $cb, $arg); # \$ref to indicate retried + my $req = shift @$inflight; + unshift(@$inflight, \$req); # \$ref to indicate retried cat_async_step($self, $inflight); # take one step } @@ -202,7 +203,7 @@ sub cat_async_retry ($$$$$) { sub cat_async_step ($$) { my ($self, $inflight) = @_; die 'BUG: inflight empty or odd' if scalar(@$inflight) < 3; - my ($req, $cb, $arg) = splice(@$inflight, 0, 3); + my ($req, $cb, $arg) = @$inflight[0, 1, 2]; my $rbuf = delete($self->{rbuf}) // \(my $new = ''); my ($bref, $oid, $type, $size); my $head = my_readline($self->{in}, $rbuf); @@ -217,8 +218,7 @@ sub cat_async_step ($$) { # ref($req) indicates it's already been retried # -gcf2 retries internally, so it never hits this path: if (!ref($req) && !$in_cleanup && $self->alternates_changed) { - return cat_async_retry($self, $inflight, - $req, $cb, $arg); + return cat_async_retry($self, $inflight); } $type = 'missing'; $oid = ref($req) ? $$req : $req if $oid eq ''; @@ -227,6 +227,7 @@ sub cat_async_step ($$) { $self->fail("bad result from async cat-file: $head$err"); } $self->{rbuf} = $rbuf if $$rbuf ne ''; + splice(@$inflight, 0, 3); # don't retry $cb on ->fail eval { $cb->($bref, $oid, $type, $size, $arg) }; async_err($self, $req, $oid, $@, 'cat') if $@; } @@ -259,7 +260,7 @@ sub cat_file { sub check_async_step ($$) { my ($self, $inflight_c) = @_; die 'BUG: inflight empty or odd' if scalar(@$inflight_c) < 3; - my ($req, $cb, $arg) = splice(@$inflight_c, 0, 3); + my ($req, $cb, $arg) = @$inflight_c[0, 1, 2]; my $rbuf = delete($self->{rbuf_c}) // \(my $new = ''); chomp(my $line = my_readline($self->{in_c}, $rbuf)); my ($hex, $type, $size) = split(/ /, $line); @@ -273,6 +274,7 @@ sub check_async_step ($$) { $self->fail(defined($ret) ? 'read EOF' : "read: $!") if !$ret; } $self->{rbuf_c} = $rbuf if $$rbuf ne ''; + splice(@$inflight_c, 0, 3); # don't retry $cb on ->fail eval { $cb->($hex, $type, $size, $arg, $self) }; async_err($self, $req, $hex, $@, 'check') if $@; }