fix: add non-retryable local errors and thread retryCtx in pull

Signed-off-by: Zhao Chen <winters.zc@antgroup.com>

Author: aftersnow

pkg/backend/pull.go

@@ -98,13 +98,13 @@ func (b *backend) Pull(ctx context.Context, target string, cfg *config.Pull) err
 	var mu sync.Mutex
 	var errs []error
 
-	var fn func(desc ocispec.Descriptor) error
+	var fn func(ctx context.Context, desc ocispec.Descriptor) error
 	if cfg.ExtractFromRemote {
-		fn = func(desc ocispec.Descriptor) error {
+		fn = func(ctx context.Context, desc ocispec.Descriptor) error {
 			return pullAndExtractFromRemote(ctx, pb, internalpb.NormalizePrompt("Pulling blob"), src, cfg.ExtractDir, desc)
 		}
 	} else {
-		fn = func(desc ocispec.Descriptor) error {
+		fn = func(ctx context.Context, desc ocispec.Descriptor) error {
 			return pullIfNotExist(ctx, pb, internalpb.NormalizePrompt("Pulling blob"), src, dst, desc, repo, tag)
 		}
 	}
@@ -122,7 +122,7 @@ func (b *backend) Pull(ctx context.Context, target string, cfg *config.Pull) err
 				logrus.Debugf("pull: processing layer %s", layer.Digest)
 				// call the before hook.
 				cfg.Hooks.BeforePullLayer(layer, manifest)
-				err := fn(layer)
+				err := fn(retryCtx, layer)
 				// call the after hook.
 				cfg.Hooks.AfterPullLayer(layer, err)
 				if err != nil {

pkg/retrypolicy/retrypolicy.go

@@ -219,7 +219,19 @@ func IsRetryable(err error) bool {
 		return true
 	}
 
-	// Unknown errors default to retryable.
+	// Local / permanent errors are not retryable.
+	if strings.Contains(errMsg, "permission denied") ||
+		strings.Contains(errMsg, "no space left on device") ||
+		strings.Contains(errMsg, "file exists") ||
+		strings.Contains(errMsg, "not a directory") ||
+		strings.Contains(errMsg, "is a directory") ||
+		strings.Contains(errMsg, "no such file or directory") ||
+		strings.Contains(errMsg, "invalid argument") {
+		return false
+	}
+
+	// Unknown errors default to retryable with a warning.
+	log.WithField("error", errMsg).Warn("[RETRY] unknown error treated as retryable")
 	return true
 }
 

pkg/retrypolicy/retrypolicy_test.go

@@ -206,6 +206,21 @@ func TestIsRetryable(t *testing.T) {
 			err:  fmt.Errorf("unexpected EOF"),
 			want: true,
 		},
+		{
+			name: "permission denied - not retryable",
+			err:  fmt.Errorf("open /data/model.bin: permission denied"),
+			want: false,
+		},
+		{
+			name: "no space left on device - not retryable",
+			err:  fmt.Errorf("write /data/model.bin: no space left on device"),
+			want: false,
+		},
+		{
+			name: "no such file or directory - not retryable",
+			err:  fmt.Errorf("open /data/model.bin: no such file or directory"),
+			want: false,
+		},
 		{
 			name: "unknown error - defaults to retryable",
 			err:  errors.New("something totally unexpected happened"),