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

Jump to bottom

fix: close file in error handling #13948

Merged
merged 1 commit into from
Apr 30, 2024
Merged

fix: close file in error handling #13948

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions promql/query_logger.go
View file
Open in desktop
Expand Up @@ -96,12 +96,14 @@ func getMMapedFile(filename string, filesize int, logger log.Logger) ([]byte, io

err = file.Truncate(int64(filesize))
if err != nil {
file.Close()
SuperQ marked this conversation as resolved.
Show resolved Hide resolved
level.Error(logger).Log("msg", "Error setting filesize.", "filesize", filesize, "err", err)
return nil, nil, err
}

fileAsBytes, err := mmap.Map(file, mmap.RDWR, 0)
if err != nil {
file.Close()
level.Error(logger).Log("msg", "Failed to mmap", "file", filename, "Attempted size", filesize, "err", err)
return nil, nil, err
}
Expand Down
5 changes: 1 addition & 4 deletions promql/query_logger_test.go
View file
Open in desktop
Expand Up @@ -110,10 +110,7 @@ func TestMMapFile(t *testing.T) {
filename := file.Name()
defer os.Remove(filename)

fileAsBytes, closer, err := getMMapedFile(filename, 2, nil)
if err != nil {
t.Cleanup(func() { closer.Close() })
}
aknuds1 marked this conversation as resolved.
Show resolved Hide resolved
fileAsBytes, _, err := getMMapedFile(filename, 2, nil)

require.NoError(t, err)
copy(fileAsBytes, "ab")
Expand Down