Merge pull request moby#42965 from thaJeztah/do_not_retry

thaJeztah · web-flow · commit 229bc1ee8bd3 · 2021-10-28T21:18:23.000+02:00
distribution: do not retry unsupported layer media types
diff --git a/distribution/push_v2.go b/distribution/push_v2.go
@@ -466,7 +466,7 @@ func (pd *v2PushDescriptor) uploadUsingSession(
 	case schema2.MediaTypeLayer:
 	default:
 		reader.Close()
-		return distribution.Descriptor{}, fmt.Errorf("unsupported layer media type %s", m)
+		return distribution.Descriptor{}, xfer.DoNotRetry{Err: fmt.Errorf("unsupported layer media type %s", m)}
 	}
 
 	digester := digest.Canonical.Digester()

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ func (pd *v2PushDescriptor) uploadUsingSession(`
`466`	`466`	`case schema2.MediaTypeLayer:`
`467`	`467`	`default:`
`468`	`468`	`reader.Close()`
`469`		`- return distribution.Descriptor{}, fmt.Errorf("unsupported layer media type %s", m)`
	`469`	`+ return distribution.Descriptor{}, xfer.DoNotRetry{Err: fmt.Errorf("unsupported layer media type %s", m)}`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`digester := digest.Canonical.Digester()`