From 13a2fcc724576a78d0955f64dc0f4494545153c3 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 8 Oct 2021 10:20:02 +0000 Subject: git: use async_wait_all everywhere Some code paths may use maximum size checks, so ensure any checks are waited on, too. --- lib/PublicInbox/LeiSearch.pm | 4 ++-- lib/PublicInbox/LeiStore.pm | 2 +- lib/PublicInbox/V2Writable.pm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm index 568277a6..4e048e9a 100644 --- a/lib/PublicInbox/LeiSearch.pm +++ b/lib/PublicInbox/LeiSearch.pm @@ -119,13 +119,13 @@ sub xoids_for { $git->cat_async($cur->{blob}, \&_cmp_1st, [$chash, $xoids, $cur, $lms]); if ($min && scalar(keys %$xoids) >= $min) { - $git->cat_async_wait; + $git->async_wait_all; return $xoids; } } } } - $git->cat_async_wait; + $git->async_wait_all; scalar(keys %$xoids) ? $xoids : undef; } diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index b4f40912..52a1456f 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -305,7 +305,7 @@ sub remove_eml { $git->cat_async($oidhex, \&_remove_if_local, $self); } } - $git->cat_async_wait; + $git->async_wait_all; remove_docids($self, @docids); \@docids; } diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 36b84f57..fcd7ffe2 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -1031,7 +1031,7 @@ sub sync_prepare ($$) { my $req = { %$sync, oid => $oid }; $self->git->cat_async($oid, $unindex_oid, $req); } - $self->git->cat_async_wait; + $self->git->async_wait_all; } return 0 if $sync->{quit}; if (!$regen_max) { @@ -1113,7 +1113,7 @@ sub unindex_todo ($$$) { $self->git->cat_async($1, $unindex_oid, { %$sync, oid => $1 }); } close $fh or die "git log failed: \$?=$?"; - $self->git->cat_async_wait; + $self->git->async_wait_all; return unless $sync->{-opt}->{prune}; my $after = scalar keys %$unindexed; @@ -1245,7 +1245,7 @@ sub xapian_only { index_xap_step($self, $sync, $art_beg, 1); } } - $self->git->cat_async_wait; + $self->git->async_wait_all; $self->{ibx}->cleanup; $self->done; } -- cgit v1.2.3-24-ge0c7