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.
-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:
# {inflight} may be non-existent, but if it isn't we delete it
# here to prevent cleanup() from waiting:
$self->{inflight} = $inflight;
batch_prepare($self);
$self->{inflight} = $inflight;
batch_prepare($self);
for (my $i = 0; $i < @$inflight; $i += 3) {
$buf .= "$inflight->[$i]\n";
}
print { $self->{out} } $buf or $self->fail("write error: $!");
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
}
cat_async_step($self, $inflight); # take one step
}
sub cat_async_step ($$) {
my ($self, $inflight) = @_;
die 'BUG: inflight empty or odd' if scalar(@$inflight) < 3;
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);
my $rbuf = delete($self->{rbuf}) // \(my $new = '');
my ($bref, $oid, $type, $size);
my $head = my_readline($self->{in}, $rbuf);
# 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) {
# 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 '';
}
$type = 'missing';
$oid = ref($req) ? $$req : $req if $oid eq '';
$self->fail("bad result from async cat-file: $head$err");
}
$self->{rbuf} = $rbuf if $$rbuf ne '';
$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 $@;
}
eval { $cb->($bref, $oid, $type, $size, $arg) };
async_err($self, $req, $oid, $@, 'cat') if $@;
}
sub check_async_step ($$) {
my ($self, $inflight_c) = @_;
die 'BUG: inflight empty or odd' if scalar(@$inflight_c) < 3;
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);
my $rbuf = delete($self->{rbuf_c}) // \(my $new = '');
chomp(my $line = my_readline($self->{in_c}, $rbuf));
my ($hex, $type, $size) = split(/ /, $line);
$self->fail(defined($ret) ? 'read EOF' : "read: $!") if !$ret;
}
$self->{rbuf_c} = $rbuf if $$rbuf ne '';
$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 $@;
}
eval { $cb->($hex, $type, $size, $arg, $self) };
async_err($self, $req, $hex, $@, 'check') if $@;
}