lei_mirror: run v1_done earlier on forkgroup done

[public-inbox.git] / lib / PublicInbox / LeiMirror.pm

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index b982f9198b88f6fc310a5bb54905770172ecb007..29bfcabf88efe31d1987b37324c0da6c2b18003a 100644 (file)
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -30,12 +30,9 @@ sub keep_going ($) {
 sub _wq_done_wait { # dwaitpid callback (via wq_eof)
        my ($arg, $pid) = @_;
        my ($mrr, $lei) = @$arg;
-       my $f = "$mrr->{dst}/mirror.done";
        if ($?) {
                $lei->child_error($?);
-       } elsif (!$mrr->{dry_run} && !unlink($f)) {
-               warn("unlink($f): $!\n") unless $!{ENOENT};
-       } else {
+       } elsif (!$lei->{child_error}) {
                if (!$mrr->{dry_run} && $lei->{cmd} ne 'public-inbox-clone') {
                        require PublicInbox::LeiAddExternal;
                        PublicInbox::LeiAddExternal::_finish_add_external(
@@ -249,7 +246,6 @@ sub index_cloned_inbox {
                PublicInbox::Admin::index_inbox($ibx, undef, $opt);
        }
        return if defined $self->{cur_dst}; # one of many repos to clone
-       open my $x, '>', "$self->{dst}/mirror.done"; # for _wq_done_wait
 }
 
 sub run_reap {
@@ -305,10 +301,10 @@ sub fgrp_update {
        my $cmd = [ 'git', "--git-dir=$fgrp->{cur_dst}",
                qw(update-ref --stdin -z) ];
        my $lei = $fgrp->{lei};
-       $lei->qerr("# @$cmd");
-       my $opt = { 0 => $r, 2 => $lei->{2} };
-       my $pid = spawn($cmd, undef, $opt);
+       my $pack = PublicInbox::OnDestroy->new($$, \&pack_dst, $fgrp);
+       start_cmd($fgrp, $cmd, { 0 => $r, 2 => $lei->{2} }, $pack);
        close $r or die "close(r): $!";
+       return if $fgrp->{dry_run};
        for my $ref (keys %dst) {
                my $new = delete $src{$ref};
                my $old = $dst{$ref};
@@ -323,30 +319,23 @@ sub fgrp_update {
                upr($lei, $w, 'create', $ref, $oid);
        }
        close($w) or warn "E: close(update-ref --stdin): $! (need git 1.8.5+)\n";
-       my $pack = PublicInbox::OnDestroy->new($$, \&pack_dst, $fgrp);
-       $LIVE->{$pid} = [ \&reap_cmd, $fgrp, $cmd, $pack ];
 }
 
 sub pack_dst { # packs lightweight satellite repos
        my ($fgrp) = @_;
        pack_refs($fgrp, $fgrp->{cur_dst});
+       delete($fgrp->{-fini}) // die 'BUG: no {-fini}'; # call v1_done
 }
 
 sub pack_refs {
        my ($self, $git_dir) = @_;
-       do_reap($self);
-       return if !keep_going($self);
        my $cmd = [ 'git', "--git-dir=$git_dir", qw(pack-refs --all --prune) ];
-       $self->{lei}->qerr("# @$cmd");
-       return if $self->{dry_run};
-       my $opt = { 2 => $self->{lei}->{2} };
-       $LIVE->{spawn($cmd, undef, $opt)} = [ \&reap_cmd, $self, $cmd ];
+       start_cmd($self, $cmd, { 2 => $self->{lei}->{2} });
 }
 
 sub fgrpv_done {
        my ($fgrpv) = @_;
        return if !$LIVE;
-       my $pid;
        my $first = $fgrpv->[0] // die 'BUG: no fgrpv->[0]';
        return if !keep_going($first);
        pack_refs($first, $first->{-osdir}); # objstore refs always packed
@@ -354,30 +343,20 @@ sub fgrpv_done {
                my $rn = $fgrp->{-remote};
                my %opt = ( 2 => $fgrp->{lei}->{2} );
 
-               my $update_ref = $fgrp->{dry_run} ? undef :
-                       PublicInbox::OnDestroy->new($$, \&fgrp_update, $fgrp);
+               my $update_ref = PublicInbox::OnDestroy->new($$,
+                                                       \&fgrp_update, $fgrp);
 
                my $src = [ 'git', "--git-dir=$fgrp->{-osdir}", 'for-each-ref',
                        "--format=refs/%(refname:lstrip=3)%00%(objectname)",
                        "refs/remotes/$rn/" ];
-               do_reap($fgrp);
-               $fgrp->{lei}->qerr("# @$src >SRC");
-               if ($update_ref) {
-                       open(my $fh, '+>', undef) or die "open(src): $!";
-                       $pid = spawn($src, undef, { %opt, 1 => $fh });
-                       $fgrp->{srcfh} = $fh;
-                       $LIVE->{$pid} = [ \&reap_cmd, $fgrp, $src, $update_ref ]
-               }
+               open(my $sfh, '+>', undef) or die "open(src): $!";
+               $fgrp->{srcfh} = $sfh;
+               start_cmd($fgrp, $src, { %opt, 1 => $sfh }, $update_ref);
                my $dst = [ 'git', "--git-dir=$fgrp->{cur_dst}", 'for-each-ref',
                        '--format=%(refname)%00%(objectname)' ];
-               do_reap($fgrp);
-               $fgrp->{lei}->qerr("# @$dst >DST");
-               if ($update_ref) {
-                       open(my $fh, '+>', undef) or die "open(dst): $!";
-                       $pid = spawn($dst, undef, { %opt, 1 => $fh });
-                       $fgrp->{dstfh} = $fh;
-                       $LIVE->{$pid} = [ \&reap_cmd, $fgrp, $dst, $update_ref ]
-               }
+               open(my $dfh, '+>', undef) or die "open(dst): $!";
+               $fgrp->{dstfh} = $dfh;
+               start_cmd($fgrp, $dst, { %opt, 1 => $dfh }, $update_ref);
        }
 }
 
@@ -400,7 +379,6 @@ sub fgrp_fetch_all {
                        qw(--no-tags --multiple));
        };
        push(@fetch, "-j$j") if $j;
-       my $pid;
        while (my ($osdir, $fgrpv) = each %$todo) {
                my $f = "$osdir/config";
 
@@ -409,7 +387,7 @@ sub fgrp_fetch_all {
                                $f, '--unset-all', "remotes.$grp"];
                $self->{lei}->qerr("# @$cmd");
                if (!$self->{dry_run}) {
-                       $pid = spawn($cmd, undef, { 2 => $self->{lei}->{2} });
+                       my $pid = spawn($cmd, undef, { 2 => $self->{lei}->{2} });
                        waitpid($pid, 0) // die "waitpid: $!";
                        die "E: @$cmd: \$?=$?" if ($? && ($? >> 8) != 5);
 
@@ -427,12 +405,8 @@ sub fgrp_fetch_all {
                }
 
                $cmd = [ @git, "--git-dir=$osdir", @fetch, $grp ];
-               do_reap($self);
-               $self->{lei}->qerr("# @$cmd");
                my $end = PublicInbox::OnDestroy->new($$, \&fgrpv_done, $fgrpv);
-               return if $self->{dry_run};
-               $pid = spawn($cmd, undef, $opt);
-               $LIVE->{$pid} = [ \&reap_cmd, $self, $cmd, $end ];
+               start_cmd($self, $cmd, $opt, $end);
        }
 }
 
@@ -1082,7 +1056,6 @@ EOM
        }
        dump_manifest($m => $ft) if delete($self->{chg}->{manifest}) || $mis;
        ft_rename($ft, $manifest, 0666);
-       open my $x, '>', "$self->{dst}/mirror.done"; # for _wq_done_wait
 }
 
 sub start_clone_url {