mount: file handler release memory

2 files changed, 11 insertions, 4 deletions

diff --git a/weed/mount/filehandle.go b/weed/mount/filehandle.go
index 49918c104..f0cf2a380 100644
--- a/weed/mount/filehandle.go
+++ b/weed/mount/filehandle.go
@@ -6,7 +6,6 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"github.com/chrislusf/seaweedfs/weed/util"
 	"golang.org/x/exp/slices"
-	"io"
 	"sync"
 )
 
@@ -24,7 +23,7 @@ type FileHandle struct {
 	dirtyMetadata  bool
 	dirtyPages     *PageWriter
 	entryViewCache []filer.VisibleInterval
-	reader         io.ReaderAt
+	reader         *filer.ChunkReadAt
 	contentType    string
 	handle         uint64
 	sync.Mutex
@@ -99,8 +98,16 @@ func (fh *FileHandle) AddChunks(chunks []*filer_pb.FileChunk) {
 	fh.entryViewCache = nil
 }
 
+func (fh *FileHandle) SetReader(reader *filer.ChunkReadAt) {
+	if fh.reader != nil {
+		fh.reader.Close()
+	}
+	fh.reader = reader
+}
+
 func (fh *FileHandle) Release() {
 	fh.dirtyPages.Destroy()
+	fh.SetReader(nil)
 }
 
 func lessThan(a, b *filer_pb.FileChunk) bool {
diff --git a/weed/mount/filehandle_read.go b/weed/mount/filehandle_read.go
index 88ab8612c..202730e88 100644
--- a/weed/mount/filehandle_read.go
+++ b/weed/mount/filehandle_read.go
@@ -62,7 +62,7 @@ func (fh *FileHandle) readFromChunks(buff []byte, offset int64) (int64, error) {
 		if chunkResolveErr != nil {
 			return 0, fmt.Errorf("fail to resolve chunk manifest: %v", chunkResolveErr)
 		}
-		fh.reader = nil
+		fh.SetReader(nil)
 	}
 
 	reader := fh.reader
@@ -74,7 +74,7 @@ func (fh *FileHandle) readFromChunks(buff []byte, offset int64) (int64, error) {
 		}
 		reader = filer.NewChunkReaderAtFromClient(fh.wfs.LookupFn(), chunkViews, fh.wfs.chunkCache, fileSize)
 	}
-	fh.reader = reader
+	fh.SetReader(reader)
 
 	totalRead, err := reader.ReadAt(buff, offset)