mirror of
https://github.com/containers/skopeo.git
synced 2025-09-24 11:26:59 +00:00
Bump github.com/containers/storage from 1.40.2 to 1.41.0
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.40.2 to 1.41.0. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/main/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.40.2...v1.41.0) --- updated-dependencies: - dependency-name: github.com/containers/storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
20
vendor/github.com/containers/storage/pkg/chunked/storage_linux.go
generated
vendored
20
vendor/github.com/containers/storage/pkg/chunked/storage_linux.go
generated
vendored
@@ -918,6 +918,9 @@ func (c *chunkedDiffer) storeMissingFiles(streams chan io.ReadCloser, errs chan
|
||||
case p := <-streams:
|
||||
part = p
|
||||
case err := <-errs:
|
||||
if err == nil {
|
||||
return errors.New("not enough data returned from the server")
|
||||
}
|
||||
return err
|
||||
}
|
||||
if part == nil {
|
||||
@@ -1081,12 +1084,18 @@ func mergeMissingChunks(missingParts []missingPart, target int) []missingPart {
|
||||
|
||||
func (c *chunkedDiffer) retrieveMissingFiles(dest string, dirfd int, missingParts []missingPart, options *archive.TarOptions) error {
|
||||
var chunksToRequest []ImageSourceChunk
|
||||
for _, c := range missingParts {
|
||||
if c.OriginFile == nil && !c.Hole {
|
||||
chunksToRequest = append(chunksToRequest, *c.SourceChunk)
|
||||
|
||||
calculateChunksToRequest := func() {
|
||||
chunksToRequest = []ImageSourceChunk{}
|
||||
for _, c := range missingParts {
|
||||
if c.OriginFile == nil && !c.Hole {
|
||||
chunksToRequest = append(chunksToRequest, *c.SourceChunk)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
calculateChunksToRequest()
|
||||
|
||||
// There are some missing files. Prepare a multirange request for the missing chunks.
|
||||
var streams chan io.ReadCloser
|
||||
var err error
|
||||
@@ -1106,6 +1115,7 @@ func (c *chunkedDiffer) retrieveMissingFiles(dest string, dirfd int, missingPart
|
||||
|
||||
// Merge more chunks to request
|
||||
missingParts = mergeMissingChunks(missingParts, requested/2)
|
||||
calculateChunksToRequest()
|
||||
continue
|
||||
}
|
||||
return err
|
||||
@@ -1575,6 +1585,8 @@ func (c *chunkedDiffer) ApplyDiff(dest string, options *archive.TarOptions) (gra
|
||||
wg.Wait()
|
||||
|
||||
for _, res := range copyResults[:filesToWaitFor] {
|
||||
r := &mergedEntries[res.index]
|
||||
|
||||
if res.err != nil {
|
||||
return output, res.err
|
||||
}
|
||||
@@ -1584,8 +1596,6 @@ func (c *chunkedDiffer) ApplyDiff(dest string, options *archive.TarOptions) (gra
|
||||
continue
|
||||
}
|
||||
|
||||
r := &mergedEntries[res.index]
|
||||
|
||||
missingPartsSize += r.Size
|
||||
|
||||
remainingSize := r.Size
|
||||
|
Reference in New Issue
Block a user