close files opened during migration (#10956)

gammazero · web-flow · commit 6faa9d85bf40 · 2025-09-08T10:20:24.000-07:00
diff --git a/cmd/ipfs/kubo/add_migrations.go b/cmd/ipfs/kubo/add_migrations.go
@@ -83,10 +83,12 @@ func addMigrationFiles(ctx context.Context, node *core.IpfsNode, paths []string,
 
 		fi, err := f.Stat()
 		if err != nil {
+			f.Close()
 			return err
 		}
 
 		ipfsPath, err := ufs.Add(ctx, files.NewReaderStatFile(f, fi), options.Unixfs.Pin(pin, ""))
+		f.Close()
 		if err != nil {
 			return err
 		}
diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go
@@ -393,6 +393,7 @@ func (r *FSRepo) SetAPIAddr(addr ma.Multiaddr) error {
 	}
 
 	if _, err = f.WriteString(addr.String()); err != nil {
+		f.Close()
 		return err
 	}
 	if err = f.Close(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,12 @@ func addMigrationFiles(ctx context.Context, node *core.IpfsNode, paths []string,`
`83`	`83`
`84`	`84`	`fi, err := f.Stat()`
`85`	`85`	`if err != nil {`
	`86`	`+ f.Close()`
`86`	`87`	`return err`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`ipfsPath, err := ufs.Add(ctx, files.NewReaderStatFile(f, fi), options.Unixfs.Pin(pin, ""))`
	`91`	`+ f.Close()`
`90`	`92`	`if err != nil {`
`91`	`93`	`return err`
`92`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,7 @@ func (r *FSRepo) SetAPIAddr(addr ma.Multiaddr) error {`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`if _, err = f.WriteString(addr.String()); err != nil {`
	`396`	`+ f.Close()`
`396`	`397`	`return err`
`397`	`398`	`}`
`398`	`399`	`if err = f.Close(); err != nil {`