github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7736 from jellor/pull-image

Browse Source 
use MaxConcurrentDownloads instead of MaxConcurrentUploadedLayers
This commit is contained in:
Maksym Pavlenko
2022-11-29 12:43:07 -08:00
committed by GitHub
parent 6f7ed272e8 ceab73007f
commit aff2cbefcc
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pull.go
View File

@@ -70,7 +70,6 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (_ Ima
tracing.Attribute("image.ref", ref), tracing.Attribute("image.ref", ref),
tracing.Attribute("unpack", pullCtx.Unpack), tracing.Attribute("unpack", pullCtx.Unpack),
tracing.Attribute("max.concurrent.downloads", pullCtx.MaxConcurrentDownloads), tracing.Attribute("max.concurrent.downloads", pullCtx.MaxConcurrentDownloads),
tracing.Attribute("max.concurrent.upload.layers", pullCtx.MaxConcurrentUploadedLayers),
tracing.Attribute("platforms.count", len(pullCtx.Platforms)), tracing.Attribute("platforms.count", len(pullCtx.Platforms)),
) )
@@ -109,7 +108,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (_ Ima
ApplyOpts: uconfig.ApplyOpts, ApplyOpts: uconfig.ApplyOpts,
} }
uopts := []unpack.UnpackerOpt{unpack.WithUnpackPlatform(platform)} uopts := []unpack.UnpackerOpt{unpack.WithUnpackPlatform(platform)}
if pullCtx.MaxConcurrentUploadedLayers > 0 { if pullCtx.MaxConcurrentDownloads > 0 {
uopts = append(uopts, unpack.WithLimiter(semaphore.NewWeighted(int64(pullCtx.MaxConcurrentDownloads)))) uopts = append(uopts, unpack.WithLimiter(semaphore.NewWeighted(int64(pullCtx.MaxConcurrentDownloads))))
} }
if uconfig.DuplicationSuppressor != nil { if uconfig.DuplicationSuppressor != nil {