git: ->fail invokes current callback

[public-inbox.git] / lib / PublicInbox / Git.pm

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index f15ace1a3d625b5d78242eb64238e4cdc2bc72ed..37342d7d10a473c77498596a2c7a8c8aa3f573e0 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -19,13 +19,14 @@ use Time::HiRes qw(stat);
 use PublicInbox::Spawn qw(popen_rd spawn);
 use PublicInbox::Tmpfile;
 use IO::Poll qw(POLLIN);
-use Carp qw(croak);
+use Carp qw(croak carp);
 use Digest::SHA ();
 use PublicInbox::DS qw(dwaitpid);
 our @EXPORT_OK = qw(git_unquote git_quote);
 our $PIPE_BUFSIZ = 65536; # Linux default
 our $in_cleanup;
 our $RDTIMEO = 60_000; # milliseconds
+our $async_warn; # true in read-only daemons
 
 use constant MAX_INFLIGHT => (POSIX::PIPE_BUF * 3) /
        65; # SHA-256 hex size + "\n" in preparation for git using non-SHA1
@@ -178,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:
@@ -188,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
 }
@@ -201,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);
@@ -216,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 '';
@@ -226,8 +227,9 @@ 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) };
-       warn "E: $oid: $@\n" if $@;
+       async_err($self, $req, $oid, $@, 'cat') if $@;
 }
 
 sub cat_async_wait ($) {
@@ -258,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);
@@ -272,8 +274,9 @@ 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) };
-       warn "E: check($req) $@\n" if $@;
+       async_err($self, $req, $hex, $@, 'check') if $@;
 }
 
 sub check_async_wait ($) {
@@ -341,9 +344,10 @@ sub async_abort ($) {
                        my $q = $self->{"inflight$c"};
                        while (@$q) {
                                my ($req, $cb, $arg) = splice(@$q, 0, 3);
+                               $req = $$req if ref($req);
                                $req =~ s/ .*//; # drop git_dir for Gcf2Client
                                eval { $cb->(undef, $req, undef, undef, $arg) };
-                               warn "E: $req: $@ (in abort)\n" if $@;
+                               warn "E: (in abort) $req: $@" if $@;
                        }
                        delete $self->{"inflight$c"};
                        delete $self->{"rbuf$c"};
@@ -358,6 +362,13 @@ sub fail { # may be augmented in subclasses
        croak(ref($self) . ' ' . ($self->{git_dir} // '') . ": $msg");
 }
 
+sub async_err ($$$$$) {
+       my ($self, $req, $oid, $err, $action) = @_;
+       $req = $$req if ref($req); # retried
+       my $msg = "E: $action $req ($oid): $err";
+       $async_warn ? carp($msg) : $self->fail($msg);
+}
+
 # $git->popen(qw(show f00)); # or
 # $git->popen(qw(show f00), { GIT_CONFIG => ... }, { 2 => ... });
 sub popen {