Merge pull request #4275 from ktock/gzip-buildkit-differ

diff: gzip with custom level should be compressed by BuildKit's differ
moby · Sep 25, 2023 · 5ed1f0b · 5ed1f0b
2 parents 0f6482e + e3af4fd
commit 5ed1f0b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/cache/blobs.go b/cache/blobs.go
@@ -189,7 +189,7 @@ func computeBlobChain(ctx context.Context, sr *immutableRef, createIfNeeded bool
 					}
 				}
 
-				if desc.Digest == "" && !isTypeWindows(sr) && comp.Type.NeedsComputeDiffBySelf() {
+				if desc.Digest == "" && !isTypeWindows(sr) && comp.Type.NeedsComputeDiffBySelf(comp) {
 					// These compression types aren't supported by containerd differ. So try to compute diff on buildkit side.
 					// This case can be happen on containerd worker + non-overlayfs snapshotter (e.g. native).
 					// See also: https://github.com/containerd/containerd/issues/4263

diff --git a/util/compression/compression.go b/util/compression/compression.go
@@ -26,7 +26,7 @@ type Type interface {
 	Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer)
 	Decompress(ctx context.Context, cs content.Store, desc ocispecs.Descriptor) (io.ReadCloser, error)
 	NeedsConversion(ctx context.Context, cs content.Store, desc ocispecs.Descriptor) (bool, error)
-	NeedsComputeDiffBySelf() bool
+	NeedsComputeDiffBySelf(comp Config) bool
 	OnlySupportOCITypes() bool
 	NeedsForceCompression() bool
 	MediaType() string

diff --git a/util/compression/estargz.go b/util/compression/estargz.go
@@ -134,7 +134,7 @@ func (c estargzType) NeedsConversion(ctx context.Context, cs content.Store, desc
 	return true, nil
 }
 
-func (c estargzType) NeedsComputeDiffBySelf() bool {
+func (c estargzType) NeedsComputeDiffBySelf(comp Config) bool {
 	return true
 }
 

diff --git a/util/compression/gzip.go b/util/compression/gzip.go
@@ -38,8 +38,9 @@ func (c gzipType) NeedsConversion(ctx context.Context, cs content.Store, desc oc
 	return true, nil
 }
 
-func (c gzipType) NeedsComputeDiffBySelf() bool {
-	return false
+func (c gzipType) NeedsComputeDiffBySelf(comp Config) bool {
+	// we allow compressing it with a customized compression level that containerd differ doesn't support so we compress it by self.
+	return comp.Level != nil
 }
 
 func (c gzipType) OnlySupportOCITypes() bool {

diff --git a/util/compression/nydus.go b/util/compression/nydus.go
@@ -104,7 +104,7 @@ func (c nydusType) NeedsConversion(ctx context.Context, cs content.Store, desc o
 	return true, nil
 }
 
-func (c nydusType) NeedsComputeDiffBySelf() bool {
+func (c nydusType) NeedsComputeDiffBySelf(comp Config) bool {
 	return true
 }
 

diff --git a/util/compression/uncompressed.go b/util/compression/uncompressed.go
@@ -40,7 +40,7 @@ func (c uncompressedType) NeedsConversion(ctx context.Context, cs content.Store,
 	return true, nil
 }
 
-func (c uncompressedType) NeedsComputeDiffBySelf() bool {
+func (c uncompressedType) NeedsComputeDiffBySelf(comp Config) bool {
 	return false
 }
 

diff --git a/util/compression/zstd.go b/util/compression/zstd.go
@@ -34,7 +34,7 @@ func (c zstdType) NeedsConversion(ctx context.Context, cs content.Store, desc oc
 	return true, nil
 }
 
-func (c zstdType) NeedsComputeDiffBySelf() bool {
+func (c zstdType) NeedsComputeDiffBySelf(comp Config) bool {
 	return true
 }