Skip to content
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

Read file part buffer after semaphore in amazon multipart upload #51

Merged
merged 1 commit into from
Sep 22, 2024
Merged

Read file part buffer after semaphore in amazon multipart upload #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions pkg/amazon/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,20 +117,21 @@ func MultiPartUpload(input MultiPartUploadInput) error {
offset := i * input.PartSize
bytesToRead := min(input.PartSize, fileSize-offset)

partBuffer := make([]byte, bytesToRead)
_, err := file.ReadAt(partBuffer, offset)
if err != nil {
return err
}

wg.Add(1)
go func(partNumber int64, partBuffer []byte) {
go func(partNumber int64, bytesToRead int64, offset int64) {
sem <- struct{}{}
defer func() {
<-sem
}()
defer wg.Done()

partBuffer := make([]byte, bytesToRead)
_, err := file.ReadAt(partBuffer, offset)
if err != nil {
ch <- err
return
}

if input.Logger != nil {
input.Logger.Debug("uploading file part", "file", input.Filepath, "part", partNumber, "size", len(partBuffer))
}
Expand All @@ -156,7 +157,7 @@ func MultiPartUpload(input MultiPartUploadInput) error {
if input.Logger != nil {
input.Logger.Debug("finished uploading file part", "file", input.Filepath, "part", partNumber, "size", len(partBuffer))
}
}(partNumber, partBuffer)
}(partNumber, bytesToRead, offset)
}

wg.Wait()
Expand Down