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-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 481D51F55B for ; Fri, 5 Jun 2020 02:01:10 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] searchidx: v1: fix retries when Xapian and Msgmap are out-of-sync Date: Fri, 5 Jun 2020 02:01:10 +0000 Message-Id: <20200605020110.11563-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We forcibly stop git-log here, so erroring out on git-log close failures is wrong since it sees SIGPIPE. Noticed while reindexing a large v1 inbox for IMAP changes. Fixes: b32b47fb12a3043d ("index: "git log" failures are fatal") --- lib/PublicInbox/SearchIdx.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index 5c161b9a..f7462aa7 100644 --- a/lib/PublicInbox/SearchIdx.pm +++ b/lib/PublicInbox/SearchIdx.pm @@ -754,10 +754,7 @@ sub _index_sync { my $xdb = $self->begin_txn_lazy; my $mm = _msgmap_init($self); do { - if ($xlog) { - close($xlog) or die "git log failed: \$?=$?"; - $xlog = undef; - } + $xlog = undef; # stop previous git-log via SIGPIPE $last_commit = _last_x_commit($self, $mm); $lx = reindex_from($opts->{reindex}, $last_commit);