Merge pull request etcd-io#16201 from Tachone/release-3.5

[Backport 3.5] etcdutl: fix db double closed
ahrtr · Jul 10, 2023 · d4f779a · d4f779a
2 parents e5bd8f4 + 2921992
commit d4f779a
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/etcdutl/snapshot/v3_snapshot.go b/etcdutl/snapshot/v3_snapshot.go
@@ -415,13 +415,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
 	}
@@ -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.Close()
+
 	return nil
 }