etcdutl: fix db double closed

Signed-off-by: shitao.lst <acm_tach@163.com>
etcd-io · Jun 28, 2023 · 7bd77c2 · 7bd77c2
1 parent bda68d8
commit 7bd77c2
Showing 1 changed file with 3 additions and 8 deletions.
diff --git 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
 }