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

filestore: Close files correctly when concatenating uploads #1239

Merged
merged 3 commits into from
Jan 16, 2025
Merged

filestore: Close files correctly when concatenating uploads #1239

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
301c702
filestore: Add a method to ensure merged chunk files are properly closed
nervtech Jan 16, 2025
58ca051
Remove unused `ctx` argument
Acconut Jan 16, 2025
f5d90ba
Handle errors from `src.Close`
Acconut Jan 16, 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
23 changes: 15 additions & 8 deletions pkg/filestore/filestore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,21 +240,28 @@ func (upload *fileUpload) ConcatUploads(ctx context.Context, uploads []handler.U
}()

for _, partialUpload := range uploads {
fileUpload := partialUpload.(*fileUpload)

src, err := os.Open(fileUpload.binPath)
if err != nil {
return err
}

if _, err := io.Copy(file, src); err != nil {
if err := partialUpload.(*fileUpload).appendTo(file); err != nil {
return err
}
}

return
}

func (upload *fileUpload) appendTo(file *os.File) error {
src, err := os.Open(upload.binPath)
if err != nil {
return err
}

if _, err := io.Copy(file, src); err != nil {
src.Close()
return err
}

return src.Close()
}

func (upload *fileUpload) DeclareLength(ctx context.Context, length int64) error {
upload.info.Size = length
upload.info.SizeIsDeferred = false
Expand Down
Loading