kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Stop retrying pull on UnkownBlob error

Browse source 
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit dee2968560)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Darren Stahl 2016-11-29 13:13:42 -08:00 committed by Victor Vieux
parent f687616995
commit c31df2f3de
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
distribution/errors.go
View file

@ -6,6 +6,7 @@ import (
"syscall" "syscall"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/distribution"
"github.com/docker/distribution/registry/api/errcode" "github.com/docker/distribution/registry/api/errcode"
"github.com/docker/distribution/registry/api/v2" "github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/registry/client" "github.com/docker/distribution/registry/client"
@ -139,6 +140,9 @@ func retryOnError(err error) error {
case *client.UnexpectedHTTPResponseError: case *client.UnexpectedHTTPResponseError:
return xfer.DoNotRetry{Err: err} return xfer.DoNotRetry{Err: err}
case error: case error:
if err == distribution.ErrBlobUnknown {
return xfer.DoNotRetry{Err: err}
}
if strings.Contains(err.Error(), strings.ToLower(syscall.ENOSPC.Error())) { if strings.Contains(err.Error(), strings.ToLower(syscall.ENOSPC.Error())) {
return xfer.DoNotRetry{Err: err} return xfer.DoNotRetry{Err: err}
} }

3
distribution/pull_v2.go
View file

@ -189,9 +189,6 @@ func (ld *v2LayerDescriptor) Download(ctx context.Context, progressOutput progre
layerDownload, err := ld.open(ctx) layerDownload, err := ld.open(ctx)
if err != nil { if err != nil {
logrus.Errorf("Error initiating layer download: %v", err) logrus.Errorf("Error initiating layer download: %v", err)
if err == distribution.ErrBlobUnknown {
return nil, 0, xfer.DoNotRetry{Err: err}
}
return nil, 0, retryOnError(err) return nil, 0, retryOnError(err)
} }