This can be useful for intermittent network errors,
and the required code changes makes it less dependent
on global state.
Pass the C<--prune> and C<--prune-tags> flags to L<git-fetch(1)>
calls on incremental clones.
Pass the C<--prune> and C<--prune-tags> flags to L<git-fetch(1)>
calls on incremental clones.
+=item -k
+
+=item --keep-going
+
+Continue as much as possible after an error.
+
our $LIVE; # pid => callback
our $LIVE; # pid => callback
+sub keep_going ($) {
+ $LIVE && (!$_[0]->{lei}->{child_error} ||
+ $_[0]->{lei}->{opt}->{'keep-going'});
+}
+
sub _wq_done_wait { # dwaitpid callback (via wq_eof)
my ($arg, $pid) = @_;
my ($mrr, $lei) = @$arg;
sub _wq_done_wait { # dwaitpid callback (via wq_eof)
my ($arg, $pid) = @_;
my ($mrr, $lei) = @$arg;
sub fgrp_update {
my ($fgrp) = @_;
sub fgrp_update {
my ($fgrp) = @_;
+ return if !keep_going($fgrp);
my $srcfh = delete $fgrp->{srcfh} or return;
my $dstfh = delete $fgrp->{dstfh} or return;
seek($srcfh, SEEK_SET, 0) or die "seek(src): $!";
my $srcfh = delete $fgrp->{srcfh} or return;
my $dstfh = delete $fgrp->{dstfh} or return;
seek($srcfh, SEEK_SET, 0) or die "seek(src): $!";
sub pack_refs {
my ($self, $git_dir) = @_;
do_reap($self);
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 $cmd = [ 'git', "--git-dir=$git_dir", qw(pack-refs --all --prune) ];
$self->{lei}->qerr("# @$cmd");
return if $self->{dry_run};
return if !$LIVE;
my $pid;
my $first = $fgrpv->[0] // die 'BUG: no fgrpv->[0]';
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
for my $fgrp (@$fgrpv) {
my $rn = $fgrp->{-remote};
pack_refs($first, $first->{-osdir}); # objstore refs always packed
for my $fgrp (@$fgrpv) {
my $rn = $fgrp->{-remote};
sub fp_done {
my ($self, $go_fetch) = @_;
sub fp_done {
my ($self, $go_fetch) = @_;
+ return if !keep_going($self);
my $fh = delete $self->{-show_ref} // die 'BUG: no show-ref output';
seek($fh, SEEK_SET, 0) or die "seek(show_ref): $!";
$self->{-ent} // die 'BUG: no -ent';
my $fh = delete $self->{-show_ref} // die 'BUG: no show-ref output';
seek($fh, SEEK_SET, 0) or die "seek(show_ref): $!";
$self->{-ent} // die 'BUG: no -ent';
sub resume_fetch {
my ($self, $uri, $fini) = @_;
sub resume_fetch {
my ($self, $uri, $fini) = @_;
+ return if !keep_going($self);
my $dst = $self->{cur_dst} // $self->{dst};
my @git = ('git', "--git-dir=$dst");
my $opt = { 2 => $self->{lei}->{2} };
my $dst = $self->{cur_dst} // $self->{dst};
my @git = ('git', "--git-dir=$dst");
my $opt = { 2 => $self->{lei}->{2} };
sub fgrp_enqueue {
my ($self, $fgrp) = @_;
sub fgrp_enqueue {
my ($self, $fgrp) = @_;
+ return if !keep_going($self);
my $opt = { 2 => $self->{lei}->{2} };
# --no-tags is required to avoid conflicts
my $u = $fgrp->{-uri} // die 'BUG: no {-uri}';
my $opt = { 2 => $self->{lei}->{2} };
# --no-tags is required to avoid conflicts
my $u = $fgrp->{-uri} // die 'BUG: no {-uri}';
my ($self, $cmd) = @_;
my $cerr = $?;
$? = 0; # don't let it influence normal exit
my ($self, $cmd) = @_;
my $cerr = $?;
$? = 0; # don't let it influence normal exit
- if ($cerr) {
- kill('TERM', keys %$LIVE);
- $self->{lei}->child_error($cerr, "@$cmd failed (\$?=$cerr)");
- }
+ $self->{lei}->child_error($cerr, "@$cmd failed (\$?=$cerr)") if $cerr;
}
sub v1_done { # called via OnDestroy
my ($self) = @_;
}
sub v1_done { # called via OnDestroy
my ($self) = @_;
- return if $self->{dry_run} || !$LIVE;
+ return if $self->{dry_run} || !keep_going($self);
_write_inbox_config($self);
my $dst = $self->{cur_dst} // $self->{dst};
if (defined(my $o = $self->{-ent} ? $self->{-ent}->{owner} : undef)) {
_write_inbox_config($self);
my $dst = $self->{cur_dst} // $self->{dst};
if (defined(my $o = $self->{-ent} ? $self->{-ent}->{owner} : undef)) {
sub v2_done { # called via OnDestroy
my ($self) = @_;
sub v2_done { # called via OnDestroy
my ($self) = @_;
- return if $self->{dry_run} || !$LIVE;
+ return if $self->{dry_run} || !keep_going($self);
my $dst = $self->{cur_dst} // $self->{dst};
require PublicInbox::Lock;
my $lk = bless { lock_path => "$dst/inbox.lock" }, 'PublicInbox::Lock';
my $dst = $self->{cur_dst} // $self->{dst};
require PublicInbox::Lock;
my $lk = bless { lock_path => "$dst/inbox.lock" }, 'PublicInbox::Lock';
# handle no-dependency repos, first
for (@$nodep) {
clone_v1($_, 1);
# handle no-dependency repos, first
for (@$nodep) {
clone_v1($_, 1);
- return if $self->{lei}->{child_error};
+ return if !keep_going($self);
}
# resolve references, deepest, first:
while (scalar keys %$todo) {
}
# resolve references, deepest, first:
while (scalar keys %$todo) {
my $y = delete $todo->{$x} // next; # already done
for (@$y) {
clone_v1($_, 1);
my $y = delete $todo->{$x} // next; # already done
for (@$y) {
clone_v1($_, 1);
- return if $self->{lei}->{child_error};
+ return if !keep_going($self);
}
last; # restart %$todo iteration
}
}
last; # restart %$todo iteration
}
E: `$self->{cur_dst}' must not contain newline
EOM
clone_v2_prep($self, \%v2_epochs, $m);
E: `$self->{cur_dst}' must not contain newline
EOM
clone_v2_prep($self, \%v2_epochs, $m);
- return if $self->{lei}->{child_error};
+ return if !keep_going($self);
}
}
if (my $v1 = delete $multi->{v1}) {
}
}
if (my $v1 = delete $multi->{v1}) {
}
delete local $lei->{opt}->{epoch} if defined($v2);
clone_all($self, $m);
}
delete local $lei->{opt}->{epoch} if defined($v2);
clone_all($self, $m);
- return if $self->{lei}->{child_error} || $self->{dry_run};
+ return if $self->{dry_run} || !keep_going($self);
# set by clone_v2_prep/-I/--exclude
dump_manifest($m => $ft) if delete $self->{-culled_manifest};
# set by clone_v2_prep/-I/--exclude
dump_manifest($m => $ft) if delete $self->{-culled_manifest};
$v = "$self->{dst}/$v" if $v !~ m!\A/!;
$self->{"-$k"} = $v;
}
$v = "$self->{dst}/$v" if $v !~ m!\A/!;
$self->{"-$k"} = $v;
}
my $iv = $lei->{opt}->{'inbox-version'} //
return start_clone_url($self);
return clone_v1($self) if $iv == 1;
my $iv = $lei->{opt}->{'inbox-version'} //
return start_clone_url($self);
return clone_v1($self) if $iv == 1;
EOF
GetOptions($opt, qw(help|h quiet|q verbose|v+ C=s@ c=s@ include|I=s@ exclude=s@
inbox-config=s inbox-version=i objstore=s manifest=s
EOF
GetOptions($opt, qw(help|h quiet|q verbose|v+ C=s@ c=s@ include|I=s@ exclude=s@
inbox-config=s inbox-version=i objstore=s manifest=s
dry-run|n jobs|j=i no-torsocks torsocks=s epoch=s)) or die $help;
if ($opt->{help}) { print $help; exit };
require PublicInbox::Admin; # loads Config
dry-run|n jobs|j=i no-torsocks torsocks=s epoch=s)) or die $help;
if ($opt->{help}) { print $help; exit };
require PublicInbox::Admin; # loads Config