user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/3] git: fatalize async callback errors by default
Date: Fri,  8 Oct 2021 10:20:04 +0000	[thread overview]
Message-ID: <20211008102004.7879-4-e@80x24.org> (raw)
In-Reply-To: <20211008102004.7879-1-e@80x24.org>

This should help us catch BUG: errors (and then some) in
-extindex and other read-write code paths.  Only read-only
daemons should warn on async callback failures, since those
aren't capable of causing data loss.
---
 lib/PublicInbox/Daemon.pm |  2 ++
 lib/PublicInbox/Git.pm    | 13 ++++++++++---
 t/git.t                   | 24 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 5be474fa8754..0acd4ee9946c 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -18,6 +18,7 @@ use PublicInbox::DS qw(now);
 require PublicInbox::Listener;
 use PublicInbox::EOFpipe;
 use PublicInbox::Sigfd;
+use PublicInbox::Git;
 use PublicInbox::GitAsyncCat;
 our $SO_ACCEPTFILTER = 0x1000;
 my @CMD;
@@ -640,6 +641,7 @@ sub run ($$$;$) {
 
 	# localize GCF2C for tests:
 	local $PublicInbox::GitAsyncCat::GCF2C;
+	local $PublicInbox::Git::async_warn = 1;
 
 	daemon_loop($refresh, $post_accept, $tlsd, $af_default);
 	PublicInbox::DS->Reset;
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index f15ace1a3d62..7c08be47bbe4 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -26,6 +26,7 @@ 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
@@ -227,7 +228,7 @@ sub cat_async_step ($$) {
 	}
 	$self->{rbuf} = $rbuf if $$rbuf ne '';
 	eval { $cb->($bref, $oid, $type, $size, $arg) };
-	warn "E: $oid: $@\n" if $@;
+	async_err($self, "E: cat $req ($oid) $@") if $@;
 }
 
 sub cat_async_wait ($) {
@@ -273,7 +274,7 @@ sub check_async_step ($$) {
 	}
 	$self->{rbuf_c} = $rbuf if $$rbuf ne '';
 	eval { $cb->($hex, $type, $size, $arg, $self) };
-	warn "E: check($req) $@\n" if $@;
+	async_err($self, "E: check $req ($hex) $@") if $@;
 }
 
 sub check_async_wait ($) {
@@ -343,7 +344,7 @@ sub async_abort ($) {
 				my ($req, $cb, $arg) = splice(@$q, 0, 3);
 				$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 +359,12 @@ sub fail { # may be augmented in subclasses
 	croak(ref($self) . ' ' . ($self->{git_dir} // '') . ": $msg");
 }
 
+sub async_err ($$) {
+	my ($self, $msg) = @_;
+	return warn($msg) if $async_warn;
+	$self->fail($msg);
+}
+
 # $git->popen(qw(show f00)); # or
 # $git->popen(qw(show f00), { GIT_CONFIG => ... }, { 2 => ... });
 sub popen {
diff --git a/t/git.t b/t/git.t
index 2a189eac6c40..8a02021103ff 100644
--- a/t/git.t
+++ b/t/git.t
@@ -68,6 +68,30 @@ use_ok 'PublicInbox::Git';
 	is_deeply($raw, $bref, 'blob result matches');
 	is_deeply($missing, [ undef, 'non-existent', 'missing', undef, $arg],
 		'non-existent blob gives expected result');
+
+	$res = [];
+	$gcf->cat_async($oid, sub { push @$res, \@_ });
+	$gcf->cat_async($oid, sub { die 'HI' });
+	$gcf->cat_async($oid, sub { push @$res, \@_ });
+	eval { $gcf->async_wait_all };
+	like($@, qr/\bHI\b/, 'die in callback propagates');
+	is(scalar(@$res), 2, 'two results');
+	is_deeply($res->[0], [ $raw, @x, undef ], '1st cb result');
+	is_deeply($res->[1], [ undef, $oid, undef, undef, undef ],
+		'2nd cb aborted ');
+
+	my @w;
+	local $PublicInbox::Git::async_warn = 1;
+	local $SIG{__WARN__} = sub { push @w, @_ };
+	$res = [];
+	$gcf->cat_async($oid, sub { push @$res, \@_ });
+	$gcf->cat_async($oid, sub { die 'HI' });
+	$gcf->cat_async($oid, sub { push @$res, \@_ });
+	eval { $gcf->async_wait_all };
+	is(scalar(@$res), 2, 'two results');
+	is_deeply($res->[0], [ $raw, @x, undef ], '1st cb result');
+	is_deeply($res->[1], [ $raw, @x, undef ], '2st cb result');
+	like("@w", qr/\bHI\b/, 'die turned to warning');
 }
 
 if (1) {

      parent reply	other threads:[~2021-10-08 10:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-08 10:20 [PATCH 0/3] git: propagate die from async callbacks Eric Wong
2021-10-08 10:20 ` [PATCH 1/3] git: use async_wait_all everywhere Eric Wong
2021-10-08 10:20 ` [PATCH 2/3] git: async_abort includes --batch-check requests Eric Wong
2021-10-08 10:20 ` Eric Wong [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211008102004.7879-4-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    --subject='Re: [PATCH 3/3] git: fatalize async callback errors by default' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).