Fix fileutil.CopyFile close semantics and error propagation#31164
Merged
Fix fileutil.CopyFile close semantics and error propagation#31164
fileutil.CopyFile close semantics and error propagation#31164Conversation
4 tasks
Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix double-close and improve error handling in fileutil
Fix May 9, 2026
fileutil.CopyFile close semantics and error propagation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes pkg/fileutil.CopyFile resource finalization so the destination is closed exactly once and Close() errors can be surfaced (without overriding earlier io.Copy / Sync() failures).
Changes:
- Introduces
copyFileContentshelper to centralizeio.Copy→Sync()→Close()sequencing and error precedence. - Updates
CopyFileto rely on the helper (removing prior double-close/cleanup behavior). - Adds unit tests covering success-path
Close()failure propagation and copy-failure precedence/cleanup.
Show a summary per file
| File | Description |
|---|---|
| pkg/fileutil/fileutil.go | Refactors copy logic into a helper to fix close semantics and propagate close errors. |
| pkg/fileutil/fileutil_test.go | Adds targeted tests for close-error propagation and copy-failure precedence/cleanup behavior. |
Copilot's findings
Tip
Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Files reviewed: 2/2 changed files
- Comments generated: 2
Comment on lines
+126
to
+137
| defer func() { | ||
| if closeErr := out.Close(); closeErr != nil && err == nil { | ||
| err = closeErr | ||
| } | ||
| }() | ||
|
|
||
| if _, err = io.Copy(out, in); err != nil { | ||
| if removeErr := os.Remove(dst); removeErr != nil { | ||
| log.Printf("Failed to remove partial destination file during cleanup: %s", removeErr) | ||
| } | ||
| return err | ||
| } |
| Close() error | ||
| } | ||
|
|
||
| func copyFileContents(in io.ReadCloser, out syncWriteCloser, dst string) (err error) { |
Collaborator
|
@copilot Review all comments |
Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
CopyFilechangescopyFileContentsto remove partial output only after closing the destinationio.ReadClosertoio.Readerand keep ownership inCopyFilepkg/fileutiltests and final validation