gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mount: release resources when Forget() is called

Browse Source 
address https://github.com/chrislusf/seaweedfs/issues/1929
This commit is contained in:
Chris Lu
2021-03-22 16:22:19 -07:00
parent 5d931eff27
commit 288369cfc7
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
weed/filesys/filehandle.go
View File

@@ -130,7 +130,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.f.reader = nil
fh.f.setReader(nil)
}
reader := fh.f.reader
@@ -138,7 +138,7 @@ func (fh *FileHandle) readFromChunks(buff []byte, offset int64) (int64, error) {
chunkViews := filer.ViewFromVisibleIntervals(fh.f.entryViewCache, 0, math.MaxInt64)
reader = filer.NewChunkReaderAtFromClient(fh.f.wfs.LookupFn(), chunkViews, fh.f.wfs.chunkCache, fileSize)
}
fh.f.reader = reader
fh.f.setReader(reader)
totalRead, err := reader.ReadAt(buff, offset)
@@ -207,12 +207,7 @@ func (fh *FileHandle) Release(ctx context.Context, req *fuse.ReleaseRequest) err
fh.f.isOpen--
fh.f.wfs.ReleaseHandle(fh.f.fullpath(), fuse.HandleID(fh.handle))
if closer, ok := fh.f.reader.(io.Closer); ok {
if closer != nil {
closer.Close()
}
}
fh.f.reader = nil
fh.f.setReader(nil)
}
return nil