fix: defer calls that return a closure need to be called (#25951) (#26393)

devanbenz · philjb · web-flow · commit 9dc4b98ad5bb · 2025-05-12T08:27:21.000-05:00
Co-authored-by: Phil Bracikowski <13472206+philjb@users.noreply.github.com> fixes #25950
diff --git a/cmd/influxd/inspect/type_conflicts/schema.go b/cmd/influxd/inspect/type_conflicts/schema.go
@@ -125,7 +125,7 @@ func (s Schema) WriteConflictsFile(filename string) error {
 
 func (s Schema) encodeSchema(filename string) (rErr error) {
 	schemaFile, err := os.Create(filename)
-	defer errors2.Capture(&rErr, schemaFile.Close)
+	defer errors2.Capture(&rErr, schemaFile.Close)()
 	if err != nil {
 		return fmt.Errorf("unable to create schema file: %w", err)
 	}
diff --git a/sqlite/sqlite.go b/sqlite/sqlite.go
@@ -138,7 +138,8 @@ func (s *SqlStore) BackupSqlStore(ctx context.Context, w io.Writer) (rErr error)
 	if err != nil {
 		return err
 	}
-	defer errors2.Capture(&rErr, dest.Close)
+
+	defer errors2.Capture(&rErr, dest.Close)() // close the backup sqlite store
 
 	if err := backup(ctx, dest, s); err != nil {
 		return err
@@ -227,16 +228,19 @@ func (s *SqlStore) RestoreSqlStore(ctx context.Context, r io.Reader) (rErr error
 	if err != nil {
 		return err
 	}
-	defer errors2.Capture(&rErr, f.Close)
+	copySyncClose := func(f *os.File, r io.Reader) (innerErr error) {
+		defer errors2.Capture(&innerErr, f.Close)() // close the temp file
 
-	// Copy the contents of r to the temporary file
-	if _, err := io.Copy(f, r); err != nil {
-		return err
-	}
-	if err := f.Sync(); err != nil {
-		return err
+		// Copy the contents of r to the temporary file
+		if _, err := io.Copy(f, r); err != nil {
+			return err
+		}
+		if err := f.Sync(); err != nil {
+			return err
+		}
+		return nil
 	}
-	if err := f.Close(); err != nil {
+	if err := copySyncClose(f, r); err != nil {
 		return err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (s Schema) WriteConflictsFile(filename string) error {`
`125`	`125`
`126`	`126`	`func (s Schema) encodeSchema(filename string) (rErr error) {`
`127`	`127`	`schemaFile, err := os.Create(filename)`
`128`		`- defer errors2.Capture(&rErr, schemaFile.Close)`
	`128`	`+ defer errors2.Capture(&rErr, schemaFile.Close)()`
`129`	`129`	`if err != nil {`
`130`	`130`	`return fmt.Errorf("unable to create schema file: %w", err)`
`131`	`131`	`}`