fix containerd#6054 MaxConcurrentDownloads is not effect when Unpack is true

timchenxiaoyu · timchenxiaoyu · commit 535191abf3b3 · 2021-10-19T10:56:01.000+08:00
Signed-off-by: weixian.cxy &lt;weixian.cxy@alibaba-inc.com&gt;
diff --git a/unpacker.go b/unpacker.go
@@ -65,11 +65,16 @@ func (c *Client) newUnpacker(ctx context.Context, rCtx *RemoteContext) (*unpacke
 			return nil, err
 		}
 	}
+	var limiter *semaphore.Weighted
+	if rCtx.MaxConcurrentDownloads > 0 {
+		limiter = semaphore.NewWeighted(int64(rCtx.MaxConcurrentDownloads))
+	}
 	return &unpacker{
 		updateCh:    make(chan ocispec.Descriptor, 128),
 		snapshotter: snapshotter,
 		config:      config,
 		c:           c,
+		limiter:     limiter,
 	}, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,16 @@ func (c Client) newUnpacker(ctx context.Context, rCtx RemoteContext) (*unpacke`
`65`	`65`	`return nil, err`
`66`	`66`	`}`
`67`	`67`	`}`
	`68`	`+ var limiter *semaphore.Weighted`
	`69`	`+ if rCtx.MaxConcurrentDownloads > 0 {`
	`70`	`+ limiter = semaphore.NewWeighted(int64(rCtx.MaxConcurrentDownloads))`
	`71`	`+ }`
`68`	`72`	`return &unpacker{`
`69`	`73`	`updateCh: make(chan ocispec.Descriptor, 128),`
`70`	`74`	`snapshotter: snapshotter,`
`71`	`75`	`config: config,`
`72`	`76`	`c: c,`
	`77`	`+ limiter: limiter,`
`73`	`78`	`}, nil`
`74`	`79`	`}`
`75`	`80`