diff --git a/etcdutl/snapshot/v3_snapshot.go b/etcdutl/snapshot/v3_snapshot.go index 8958ba80d..d9837b803 100644 --- a/etcdutl/snapshot/v3_snapshot.go +++ b/etcdutl/snapshot/v3_snapshot.go @@ -340,13 +340,8 @@ func (s *v3Manager) copyAndVerifyDB() error { if dberr != nil { return dberr } - dbClosed := false - defer func() { - if !dbClosed { - db.Close() - dbClosed = true - } - }() + defer db.Close() + if _, err := io.Copy(db, srcf); err != nil { return err } @@ -383,7 +378,7 @@ func (s *v3Manager) copyAndVerifyDB() error { } // db hash is OK, can now modify DB so it can be part of a new cluster - db.Close() + return nil }