Merge pull request #16120 from Tachone/shitao.lst/fix_db_close

etcdutl: fix db double closed
etcd-io · Jul 6, 2023 · 4364e75 · 4364e75
2 parents f4444e8 + 7bd77c2
commit 4364e75
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/etcdutl/snapshot/v3_snapshot.go b/etcdutl/snapshot/v3_snapshot.go
@@ -422,13 +422,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
 	}
@@ -465,7 +460,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
 }