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 1CDDB1F454 for ; Mon, 4 Nov 2019 00:43:14 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] index: "git log" failures are fatal Date: Mon, 4 Nov 2019 00:43:14 +0000 Message-Id: <20191104004314.3220-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: While I've never seen "git log" fail on its own, it could happen one day and we should be prepared to abort indexing when it happens. Beef up tests for t/spawn.t to ensure close() behaves on popen_rd the way we expect it to. --- lib/PublicInbox/SearchIdx.pm | 8 ++++++-- lib/PublicInbox/V2Writable.pm | 5 +++-- t/spawn.t | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index b2d71a1f..f265fa7f 100644 --- a/lib/PublicInbox/SearchIdx.pm +++ b/lib/PublicInbox/SearchIdx.pm @@ -590,6 +590,7 @@ sub read_log { $newest ||= $latest; } } + close($log) or die "git log failed: \$?=$?"; # get the leftovers foreach my $blob (keys %D) { my $mime = do_cat_mail($git, $blob, \$bytes) or next; @@ -632,7 +633,7 @@ sub _git_log { --no-notes --no-color --no-renames --diff-filter=AM), $range); ++$fcount while <$fh>; - close $fh; + close $fh or die "git log failed: \$?=$?"; my $high = $self->{mm}->num_highwater; $pr->("$fcount\n") if $pr; # continue previous line $self->{ntodo} = $fcount; @@ -713,7 +714,10 @@ sub _index_sync { my $xdb = $self->begin_txn_lazy; my $mm = _msgmap_init($self); do { - $xlog = undef; + if ($xlog) { + close($xlog) or die "git log failed: \$?=$?"; + $xlog = undef; + } $last_commit = _last_x_commit($self, $mm); $lx = reindex_from($opts->{reindex}, $last_commit); diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 1825da2c..02f313b0 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -1128,6 +1128,7 @@ sub sync_prepare ($$$) { --no-notes --no-color --no-renames --diff-filter=AM), $range, '--', 'm'); ++$n while <$fh>; + close $fh or die "git log failed: \$?=$?"; $pr->("$n\n") if $pr; $regen_max += $n; } @@ -1195,7 +1196,7 @@ sub unindex ($$$$) { unindex_oid($self, $git, $1, $unindexed); } delete $self->{reindex_pipe}; - $fh = undef; + close $fh or die "git log failed: \$?=$?"; return unless $sync->{-opt}->{prune}; my $after = scalar keys %$unindexed; @@ -1251,7 +1252,7 @@ sub index_epoch ($$$) { mark_deleted($self, $sync, $git, $1); } } - $fh = undef; + close $fh or die "git log failed: \$?=$?"; delete $self->{reindex_pipe}; update_last_commit($self, $git, $i, $cmt) if defined $cmt; } diff --git a/t/spawn.t b/t/spawn.t index aba1a26c..ebebfb57 100644 --- a/t/spawn.t +++ b/t/spawn.t @@ -71,13 +71,13 @@ use PublicInbox::Spawn qw(which spawn popen_rd); is($buf, "hello\n", 'tied gets works'); is(sysread($fh, $buf, 6), 0, 'sysread got EOF'); $? = 1; - close $fh; + ok(close($fh), 'close succeeds'); is($?, 0, '$? set properly'); } { my $fh = popen_rd([qw(false)]); - close $fh; + ok(!close($fh), 'close fails on false'); isnt($?, 0, '$? set properly: '.$?); }