From ac62fcda86f4b79422299bb2dde8bee8c9e08c62 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Fri, 30 Sep 2022 09:21:39 +0000
Subject: [PATCH] lei_to_mail: propagate errors to script/lei

We need to rely on lei->fail to propagate errors in lei workers
to the script/lei client, otherwise tests and other scripts can
stumble forward with incomplete/incorrect/broken outputs.

This helps me focus on occasional t/lei-up.t failures I see on
CentOS 7.x where OverIdx->adj_counter fails on "lei up --all"...
---
 lib/PublicInbox/LeiToMail.pm | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 03cbde3b..b58e2652 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -132,19 +132,22 @@ sub eml2mboxcl2 {
 }
 
 sub git_to_mail { # git->cat_async callback
-	my ($bref, $oid, $type, $size, $arg) = @_;
+	my ($bref, $oid, $type, $size, $smsg) = @_;
+	my $self = delete $smsg->{l2m} // die "BUG: no l2m";
 	$type // return; # called by git->async_abort
-	my ($write_cb, $smsg) = @$arg;
-	if ($type eq 'missing' && $smsg->{-lms_rw}) {
-		if ($bref = $smsg->{-lms_rw}->local_blob($oid, 1)) {
+	eval {
+		if ($type eq 'missing' &&
+			  ($bref = $self->{-lms_rw}->local_blob($oid, 1))) {
 			$type = 'blob';
 			$size = length($$bref);
 		}
-	}
-	return warn("W: $oid is $type (!= blob)\n") if $type ne 'blob';
-	return warn("E: $oid is empty\n") unless $size;
-	die "BUG: expected=$smsg->{blob} got=$oid" if $smsg->{blob} ne $oid;
-	$write_cb->($bref, $smsg);
+		$type eq 'blob' or return $self->{lei}->child_error(1,
+						"W: $oid is $type (!= blob)");
+		$size or return $self->{lei}->child_error(1,"E: $oid is empty");
+		$smsg->{blob} eq $oid or die "BUG: expected=$smsg->{blob}";
+		$self->{wcb}->($bref, $smsg);
+	};
+	$self->{lei}->fail("$@ (oid=$oid)") if $@;
 }
 
 sub reap_compress { # dwaitpid callback
@@ -790,19 +793,22 @@ sub poke_dst {
 
 sub write_mail { # via ->wq_io_do
 	my ($self, $smsg, $eml) = @_;
-	return $self->{wcb}->(undef, $smsg, $eml) if $eml;
-	$smsg->{-lms_rw} = $self->{-lms_rw};
-	$self->{git}->cat_async($smsg->{blob}, \&git_to_mail,
-				[$self->{wcb}, $smsg]);
+	if ($eml) {
+		eval { $self->{wcb}->(undef, $smsg, $eml) };
+		$self->{lei}->fail("blob=$smsg->{blob} $@") if $@;
+	} else {
+		$smsg->{l2m} = $self;
+		$self->{git}->cat_async($smsg->{blob}, \&git_to_mail, $smsg);
+	}
 }
 
 sub wq_atexit_child {
 	my ($self) = @_;
 	local $PublicInbox::DS::in_loop = 0; # waitpid synchronously
 	my $lei = $self->{lei};
-	delete $self->{wcb};
 	$lei->{ale}->git->async_wait_all;
 	my ($nr_w, $nr_s) = delete(@$lei{qw(-nr_write -nr_seen)});
+	delete $self->{wcb};
 	$nr_s or return;
 	return if $lei->{early_mua} || !$lei->{-progress} || !$lei->{pkt_op_p};
 	$lei->{pkt_op_p}->pkt_do('l2m_progress', $nr_w, $nr_s);
-- 
2.44.0