containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chunked: report the correct size 

report the correct size for a layer that was pulled
using the chunked package.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2023-02-27 20:25:45 +01:00
parent 4ba32904fe
commit 39cac28763
No known key found for this signature in database
GPG Key ID: 67E38F7A8BA21772
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/chunked/storage_linux.go
View File

@ -1302,10 +1302,13 @@ func (c *chunkedDiffer) ApplyDiff(dest string, options *archive.TarOptions) (gra
var missingParts []missingPart var missingParts []missingPart
mergedEntries, err := c.mergeTocEntries(c.fileType, toc.Entries) mergedEntries, totalSize, err := c.mergeTocEntries(c.fileType, toc.Entries)
if err != nil { if err != nil {
return output, err return output, err
} }
output.Size = totalSize
if err := maybeDoIDRemap(mergedEntries, options); err != nil { if err := maybeDoIDRemap(mergedEntries, options); err != nil {
return output, err return output, err
} }
@ -1589,7 +1592,9 @@ func mustSkipFile(fileType compressedFileType, e internal.FileMetadata) bool {
return false return false
} }
func (c *chunkedDiffer) mergeTocEntries(fileType compressedFileType, entries []internal.FileMetadata) ([]internal.FileMetadata, error) { func (c *chunkedDiffer) mergeTocEntries(fileType compressedFileType, entries []internal.FileMetadata) ([]internal.FileMetadata, int64, error) {
var totalFilesSize int64
countNextChunks := func(start int) int { countNextChunks := func(start int) int {
count := 0 count := 0
for _, e := range entries[start:] { for _, e := range entries[start:] {
@ -1618,8 +1623,11 @@ func (c *chunkedDiffer) mergeTocEntries(fileType compressedFileType, entries []i
if mustSkipFile(fileType, e) { if mustSkipFile(fileType, e) {
continue continue
} }
totalFilesSize += e.Size
if e.Type == TypeChunk { if e.Type == TypeChunk {
return nil, fmt.Errorf("chunk type without a regular file") return nil, -1, fmt.Errorf("chunk type without a regular file")
} }
if e.Type == TypeReg { if e.Type == TypeReg {
@ -1652,7 +1660,7 @@ func (c *chunkedDiffer) mergeTocEntries(fileType compressedFileType, entries []i
lastChunkOffset = mergedEntries[i].Chunks[j].Offset lastChunkOffset = mergedEntries[i].Chunks[j].Offset
} }
} }
return mergedEntries, nil return mergedEntries, totalFilesSize, nil
} }
// validateChunkChecksum checks if the file at $root/$path[offset:chunk.ChunkSize] has the // validateChunkChecksum checks if the file at $root/$path[offset:chunk.ChunkSize] has the