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

db.go: clean up file descriptor on init/read failures #89

Merged
merged 2 commits into from
Mar 18, 2018
Merged

db.go: clean up file descriptor on init/read failures #89

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
818c231
Clean up file descriptors on failed database initialization
cj-dimaggio Aug 29, 2017
3130a60
db.go: clean up file descriptor on db.file.ReadAt fail
gyuho Mar 18, 2018
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
4 changes: 4 additions & 0 deletions db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,13 @@ func Open(path string, mode os.FileMode, options *Options) (*DB, error) {

// Initialize the database if it doesn't exist.
if info, err := db.file.Stat(); err != nil {
_ = db.close()
return nil, err
} else if info.Size() == 0 {
// Initialize new files with meta pages.
if err := db.init(); err != nil {
// clean up file descriptor on initialization fail
_ = db.close()
return nil, err
}
} else {
Expand All @@ -236,6 +239,7 @@ func Open(path string, mode os.FileMode, options *Options) (*DB, error) {
db.pageSize = int(m.pageSize)
}
} else {
_ = db.close()
return nil, ErrInvalid
}
}
Expand Down