fix: close read readers

erock created pr with ps-96 on 2025-01-21T15:08:10Z

erock changed status on 2025-02-01T18:43:27Z {"status":"accepted"}

ps-96 by erock on 2025-01-21T15:08:10Z

Patchset `ps-96`

Eric Bower

2024-07-09T01:59:33Z

rsyncsender/sender.go

+1 -0

utils/fs.go

+6 -1

+1 -0 rsyncsender/sender.go link

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12


diff --git a/rsyncsender/sender.go b/rsyncsender/sender.go
index 292b92a..5babaf1 100644
--- a/rsyncsender/sender.go
+++ b/rsyncsender/sender.go
@@ -141,6 +141,7 @@ func (st *sendTransfer) sendFile(fileIndex int32, fl *utils.SenderFile) error {
 	const chunkSize = 32 * 1024
 
 	fi, f, err := st.filesystem.Read(fl)
+	defer f.Close()
 	if err != nil {
 		return err
 	}

+6 -1 utils/fs.go link

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21


diff --git a/utils/fs.go b/utils/fs.go
index f129817..f446f81 100644
--- a/utils/fs.go
+++ b/utils/fs.go
@@ -5,10 +5,15 @@ import (
 	"os"
 )
 
+type ReaderAtCloser interface {
+	io.ReaderAt
+	io.Closer
+}
+
 // File System: need to handle all type of files: regular, folder, symlink, etc
 type FS interface {
 	Put(*ReceiverFile) (int64, error)
 	Skip(*ReceiverFile) bool
 	List(string) ([]os.FileInfo, error)
-	Read(*SenderFile) (os.FileInfo, io.ReaderAt, error)
+	Read(*SenderFile) (os.FileInfo, ReaderAtCloser, error)
 }