Skip to content

fix: check blob exist before copying layers samller than chunk size #21883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wy65701436 merged 2 commits into from
Apr 21, 2025
Merged

fix: check blob exist before copying layers samller than chunk size #21883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d701d88
fix: check blob exist before copying layers samller than chunk size
liubin Apr 15, 2025
7e434f7
Merge branch 'main' into fix-avoid-copying-layers-smaller-than-chucnk…
wy65701436 Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/controller/replication/transfer/image/transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,6 @@ func (t *transfer) copyBlobByMonolithic(srcRepo, dstRepo, digest string, sizeFro
// copyBlobByChunk copy blob by chunk with specified start and end range.
// The <range> refers to the byte range of the chunk, and MUST be inclusive on both ends. The first chunk's range MUST begin with 0.
func (t *transfer) copyBlobByChunk(srcRepo, dstRepo, digest string, sizeFromDescriptor int64, start, end *int64, location *string, speed int32) error {
// fallback to copy by monolithic if the blob size is equal or less than chunk size.
if sizeFromDescriptor <= replicationChunkSize {
return t.copyBlobByMonolithic(srcRepo, dstRepo, digest, sizeFromDescriptor, speed)
}

mounted, err := t.tryMountBlob(srcRepo, dstRepo, digest)
if err != nil {
return err
Expand All @@ -417,6 +412,11 @@ func (t *transfer) copyBlobByChunk(srcRepo, dstRepo, digest string, sizeFromDesc
return nil
}

// fallback to copy by monolithic if the blob size is equal or less than chunk size.
if sizeFromDescriptor <= replicationChunkSize {
return t.copyBlobByMonolithic(srcRepo, dstRepo, digest, sizeFromDescriptor, speed)
}

// end range should equal (blobSize - 1)
endRange := sizeFromDescriptor - 1
for {
Expand Down
Loading