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

clientv3: v3Manager#saveDB should always close db file #11838

Merged
merged 1 commit into from
May 4, 2020
Merged

clientv3: v3Manager#saveDB should always close db file #11838

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
8 changes: 8 additions & 0 deletions clientv3/snapshot/v3_snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,13 @@ func (s *v3Manager) saveDB() error {
if dberr != nil {
return dberr
}
dbClosed := false
defer func() {
if !dbClosed {
db.Close()
dbClosed = true
}
}()
if _, err := io.Copy(db, f); err != nil {
return err
}
Expand Down Expand Up @@ -375,6 +382,7 @@ func (s *v3Manager) saveDB() error {

// db hash is OK, can now modify DB so it can be part of a new cluster
db.Close()
dbClosed = true

commit := len(s.cl.Members())

Expand Down