diff options
| author |   espie <espie@openbsd.org> | 2006-02-21 19:20:54 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2006-02-21 19:20:54 +0000 |
| commit | b6ce3f10bbd9bbcfb3ed17f63ed6ca62ed9553d9 (patch) | |
| tree | 60fc33cfe688c071455b50a7a3f9133fc44ee709 | |
| parent | ask question corresponding to -F updatedepends too (commonalize code). (diff) | |
| download | wireguard-openbsd-b6ce3f10bbd9bbcfb3ed17f63ed6ca62ed9553d9.tar.xz wireguard-openbsd-b6ce3f10bbd9bbcfb3ed17f63ed6ca62ed9553d9.zip | |
detect temporary connection errors, and retry with exponential timeout.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageLocator.pm | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm index bccaa4b56bb..fecbf935c72 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageLocator.pm,v 1.49 2006/02/09 09:38:41 espie Exp $ +# $OpenBSD: PackageLocator.pm,v 1.50 2006/02/21 19:20:54 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -198,6 +198,14 @@ sub parse_problems print STDERR "Error from $baseurl:\n" if $notyet; $notyet = 0; } + if (m/^421\s+/ || + m/^ftp: connect: Connection timed out/ || + m/^ftp: Can't connect or login to host/) { + $self->{lasterror} = 421; + } + if (m/^550\s+/) { + $self->{lasterror} = 550; + } print STDERR $_; } CORE::close($fh); @@ -953,7 +961,21 @@ sub find my ($self, $pkgname, $arch, $srcpath) = @_; for my $repo (@{$self->{list}}) { - my $pkg = $repo->find($pkgname, $arch, $srcpath); + my $pkg; + + for (my $retry = 5; $retry < 60; $retry *= 2) { + undef $repo->{lasterror}; + $pkg = $repo->find($pkgname, $arch, $srcpath); + if (!defined $pkg && defined $repo->{lasterror} && + $repo->{lasterror} == 421 && + defined $self->{avail} && + $self->{avail}->{$pkgname} eq $repo) { + print STDERR "Temporary error, sleeping $retry seconds\n"; + sleep($retry); + } else { + last; + } + } return $pkg if defined $pkg; } return undef; @@ -964,7 +986,21 @@ sub grabPlist my ($self, $pkgname, $arch, $code) = @_; for my $repo (@{$self->{list}}) { - my $plist = $repo->grabPlist($pkgname, $arch, $code); + my $plist; + + for (my $retry = 5; $retry < 60; $retry *= 2) { + undef $repo->{lasterror}; + $plist = $repo->grabPlist($pkgname, $arch, $code); + if (!defined $plist && defined $repo->{lasterror} && + $repo->{lasterror} == 421 && + defined $self->{avail} && + $self->{avail}->{$pkgname} eq $repo) { + print STDERR "Temporary error, sleeping $retry seconds\n"; + sleep($retry); + } else { + last; + } + } return $plist if defined $plist; } return undef; |