Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16201 from Tachone/release-3.5

Browse Source 
[Backport 3.5] etcdutl: fix db double closed
This commit is contained in:
Benjamin Wang 2023-07-10 11:15:05 +01:00 committed by GitHub
commit d4f779a643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etcdutl/snapshot/v3_snapshot.go
View File

@ -415,13 +415,8 @@ func (s *v3Manager) copyAndVerifyDB() error {
if dberr != nil { if dberr != nil {
return dberr return dberr
} }
dbClosed := false defer db.Close()
defer func() {
if !dbClosed {
db.Close()
dbClosed = true
}
}()
if _, err := io.Copy(db, srcf); err != nil { if _, err := io.Copy(db, srcf); err != nil {
return err return err
} }
@ -458,7 +453,7 @@ func (s *v3Manager) copyAndVerifyDB() error {
} }
// db hash is OK, can now modify DB so it can be part of a new cluster // db hash is OK, can now modify DB so it can be part of a new cluster
db.Close()
return nil return nil
} }